mirrors/citra
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge pull request #4143 from zhaowenlan1779/shared-font-text-fix

Browse source 
core, citra_qt: unify status of system archives and shared fonts
This commit is contained in:
Merry 2018-09-06 20:51:32 +01:00 committed by GitHub
commit eca98eeb3e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/citra_qt/main.cpp
View file

@ -1402,14 +1402,15 @@ void GMainWindow::UpdateStatusBar() {
void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string details) { void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string details) {
QMessageBox::StandardButton answer; QMessageBox::StandardButton answer;
QString status_message; QString status_message;
const QString common_message =
tr("%1 is missing. Please <a "
"href='https://citra-emu.org/wiki/"
"dumping-system-archives-and-the-shared-fonts-from-a-3ds-console/'>dump your "
"system archives</a>.<br/>Continuing emulation may result in crashes and bugs.");
QString title, message; QString title, message;
switch (result) { if (result == Core::System::ResultStatus::ErrorSystemFiles) {
case Core::System::ResultStatus::ErrorSystemFiles: { const QString common_message =
tr("%1 is missing. Please <a "
"href='https://citra-emu.org/wiki/"
"dumping-system-archives-and-the-shared-fonts-from-a-3ds-console/'>dump your "
"system archives</a>.<br/>Continuing emulation may result in crashes and bugs.");
if (!details.empty()) { if (!details.empty()) {
message = common_message.arg(QString::fromStdString(details)); message = common_message.arg(QString::fromStdString(details));
} else { } else {
@ -1418,18 +1419,7 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string det
title = tr("System Archive Not Found"); title = tr("System Archive Not Found");
status_message = "System Archive Missing"; status_message = "System Archive Missing";
break; } else {
}
case Core::System::ResultStatus::ErrorSharedFont: {
message = tr("Shared fonts not found. ");
message.append(common_message);
title = tr("Shared Fonts Not Found");
status_message = "Shared Font Missing";
break;
}
default:
title = tr("Fatal Error"); title = tr("Fatal Error");
message = message =
tr("A fatal error occured. " tr("A fatal error occured. "
@ -1437,7 +1427,6 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string det
"the log</a> for details." "the log</a> for details."
"<br/>Continuing emulation may result in crashes and bugs."); "<br/>Continuing emulation may result in crashes and bugs.");
status_message = "Fatal Error encountered"; status_message = "Fatal Error encountered";
break;
} }
QMessageBox message_box; QMessageBox message_box;

1
src/core/core.h
View file

@ -50,7 +50,6 @@ public:
ErrorLoader_ErrorInvalidFormat, ///< Error loading the specified application due to an ErrorLoader_ErrorInvalidFormat, ///< Error loading the specified application due to an
/// invalid format /// invalid format
ErrorSystemFiles, ///< Error in finding system files ErrorSystemFiles, ///< Error in finding system files
ErrorSharedFont, ///< Error in finding shared font
ErrorVideoCore, ///< Error in the video core ErrorVideoCore, ///< Error in the video core
ErrorVideoCore_ErrorGenericDrivers, ///< Error in the video core due to the user having ErrorVideoCore_ErrorGenericDrivers, ///< Error in the video core due to the user having
/// generic drivers installed /// generic drivers installed

3
src/core/hle/service/apt/apt.cpp
View file

@ -204,7 +204,8 @@ void Module::Interface::GetSharedFont(Kernel::HLERequestContext& ctx) {
rb.Push<u32>(-1); // TODO: Find the right error code rb.Push<u32>(-1); // TODO: Find the right error code
rb.Push<u32>(0); rb.Push<u32>(0);
rb.PushCopyObjects<Kernel::Object>(nullptr); rb.PushCopyObjects<Kernel::Object>(nullptr);
Core::System::GetInstance().SetStatus(Core::System::ResultStatus::ErrorSharedFont); Core::System::GetInstance().SetStatus(Core::System::ResultStatus::ErrorSystemFiles,
"Shared fonts");
return; return;
} }
} }