yuzu-emu
/
yuzu
Archived
1
0
Fork 0
Code

Merge pull request #5285 from lioncash/error-str 

main: Resolve error string not displaying
This commit is contained in:
Rodrigo Locatti 2021-01-03 19:56:15 -03:00 committed by GitHub
parent 7265e80c12 86592b274e
commit 87a8925523
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/loader/loader.cpp
View File

@ -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.", "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) { std::ostream& operator<<(std::ostream& os, ResultStatus status) {
os << RESULT_MESSAGES.at(static_cast<std::size_t>(status)); os << RESULT_MESSAGES.at(static_cast<std::size_t>(status));
return os; return os;

1
src/core/loader/loader.h
View File

@ -135,6 +135,7 @@ enum class ResultStatus : u16 {
ErrorINITooManyKIPs, ErrorINITooManyKIPs,
}; };
std::string GetResultStatusString(ResultStatus status);
std::ostream& operator<<(std::ostream& os, ResultStatus status); std::ostream& operator<<(std::ostream& os, ResultStatus status);
/// Interface for loading an application /// Interface for loading an application

5
src/yuzu/main.cpp
View File

@ -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 " 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 " "yuzu quickstart guide</a> to redump your files.<br>You can refer "
"to the yuzu wiki</a> or the yuzu Discord</a> for help.", "to the yuzu wiki</a> or the yuzu Discord</a> for help.",
"%1 signifies a numeric error ID.") "%1 signifies an error string.")
.arg(error_id); .arg(QString::fromStdString(
GetResultStatusString(static_cast<Loader::ResultStatus>(error_id))));
QMessageBox::critical(this, title, description); QMessageBox::critical(this, title, description);
} else { } else {