summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2021-01-03 19:18:02 +0100
committerLioncash <mathew1800@gmail.com>2021-01-03 19:18:04 +0100
commit86592b274e228708cf0f9e1f4063e917f1bb3bd5 (patch)
tree5b18fb291f5655be3b6e9495efc7c7410b0bbfd8
parentMerge pull request #5278 from MerryMage/cpuopt_unsafe_inaccurate_nan (diff)
downloadyuzu-86592b274e228708cf0f9e1f4063e917f1bb3bd5.tar
yuzu-86592b274e228708cf0f9e1f4063e917f1bb3bd5.tar.gz
yuzu-86592b274e228708cf0f9e1f4063e917f1bb3bd5.tar.bz2
yuzu-86592b274e228708cf0f9e1f4063e917f1bb3bd5.tar.lz
yuzu-86592b274e228708cf0f9e1f4063e917f1bb3bd5.tar.xz
yuzu-86592b274e228708cf0f9e1f4063e917f1bb3bd5.tar.zst
yuzu-86592b274e228708cf0f9e1f4063e917f1bb3bd5.zip
-rw-r--r--src/core/loader/loader.cpp4
-rw-r--r--src/core/loader/loader.h1
-rw-r--r--src/yuzu/main.cpp5
3 files changed, 8 insertions, 2 deletions
diff --git a/src/core/loader/loader.cpp b/src/core/loader/loader.cpp
index d91c15561..e4f5fd40c 100644
--- a/src/core/loader/loader.cpp
+++ b/src/core/loader/loader.cpp
@@ -185,6 +185,10 @@ constexpr std::array<const char*, 66> 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<std::size_t>(status));
+}
+
std::ostream& operator<<(std::ostream& os, ResultStatus status) {
os << RESULT_MESSAGES.at(static_cast<std::size_t>(status));
return os;
diff --git a/src/core/loader/loader.h b/src/core/loader/loader.h
index 36e79e71d..b2e5b13de 100644
--- 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 43d64b708..d1c539b72 100644
--- a/src/yuzu/main.cpp
+++ b/src/yuzu/main.cpp
@@ -1058,8 +1058,9 @@ bool GMainWindow::LoadROM(const QString& filename, std::size_t program_index) {
tr("%1<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the "
"yuzu quickstart guide</a> to redump your files.<br>You can refer "
"to the yuzu wiki</a> or the yuzu Discord</a> for help.",
- "%1 signifies a numeric error ID.")
- .arg(error_id);
+ "%1 signifies an error string.")
+ .arg(QString::fromStdString(
+ GetResultStatusString(static_cast<Loader::ResultStatus>(error_id))));
QMessageBox::critical(this, title, description);
} else {