From 3980d748990c49421071a12659ee7f73db2d973a Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Mon, 4 Jan 2021 00:44:02 +0100 Subject: [PATCH] early-access version 1285 --- README.md | 2 +- src/core/loader/loader.cpp | 4 ++++ src/core/loader/loader.h | 1 + src/yuzu/main.cpp | 5 +++-- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index a92f50d96..ac6167dfc 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 1284. +This is the source code for early-access 1285. ## Legal Notice diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp index d91c15561..e4f5fd40c 100755 --- a/src/core/loader/loader.cpp +++ b/src/core/loader/loader.cpp @@ -185,6 +185,10 @@ constexpr std::array RESULT_MESSAGES{ "The INI file contains more than the maximum allowable number of KIP files.", }; +std::string GetResultStatusString(ResultStatus status) { + return RESULT_MESSAGES.at(static_cast(status)); +} + std::ostream& operator<<(std::ostream& os, ResultStatus status) { os << RESULT_MESSAGES.at(static_cast(status)); return os; diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h index 36e79e71d..b2e5b13de 100755 --- a/src/core/loader/loader.h +++ b/src/core/loader/loader.h @@ -135,6 +135,7 @@ enum class ResultStatus : u16 { ErrorINITooManyKIPs, }; +std::string GetResultStatusString(ResultStatus status); std::ostream& operator<<(std::ostream& os, ResultStatus status); /// Interface for loading an application diff --git a/src/yuzu/main.cpp b/src/yuzu/main.cpp index 70045f2f5..48f39e565 100755 --- a/src/yuzu/main.cpp +++ b/src/yuzu/main.cpp @@ -1094,8 +1094,9 @@ bool GMainWindow::LoadROM(const QString& filename, std::size_t program_index) { tr("%1
Please follow the " "yuzu quickstart guide to redump your files.
You can refer " "to the yuzu wiki or the yuzu Discord for help.", - "%1 signifies a numeric error ID.") - .arg(error_id); + "%1 signifies an error string.") + .arg(QString::fromStdString( + GetResultStatusString(static_cast(error_id)))); QMessageBox::critical(this, title, description); } else {