eden-emu/eden
14
3
Fork 4
Code Issues 3 Pull requests 4 Projects Releases 2 Packages Wiki Activity Actions 6

Made some changes from review comments:

Browse source 
- Made LoadKernelSystemMode return a pair consisting of a system mode and a result code (Could use review).
- Deleted ErrorOpenGL error code in favor of just having ErrorVideoCore.
- Made dialog messages more clear.
- Compared archive ID in fs_user.cpp to ArchiveIdCode::NCCH as opposed to hex magic.
- Cleaned up some other stuff.
This commit is contained in:
TheKoopaKingdom 2017-03-08 20:21:31 -05:00
parent 1ecb322daa
commit 37bec598ea
10 changed files with 55 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/citra_qt/main.cpp
View file

@ -300,7 +300,7 @@ bool GMainWindow::LoadROM(const QString& filename) {
render_window->MakeCurrent();
if (!gladLoadGL()) {
QMessageBox::critical(this, tr("Error while starting Citra!"),
QMessageBox::critical(this, tr("Error while initializing OpenGL 3.3 Core!"),
tr("Your GPU may not support OpenGL 3.3, or you do not"
"have the latest graphics driver."));
return false;
@ -329,7 +329,7 @@ bool GMainWindow::LoadROM(const QString& filename) {
QMessageBox::critical(
this, tr("Error while loading ROM!"),
tr("The game that you are trying to load must be decrypted before being used with "
"Citra.<br/><br/>"
"Citra. A real 3DS is required.<br/><br/>"
"For more information on dumping and decrypting games, please see the following "
"wiki pages: <ul>"
"<li><a href='https://citra-emu.org/wiki/Dumping-Game-Cartridges/'>Dumping Game "
@ -344,10 +344,17 @@ bool GMainWindow::LoadROM(const QString& filename) {
tr("The ROM format is not supported."));
break;
case Core::System::ResultStatus::ErrorOpenGL:
QMessageBox::critical(this, tr("Error while loading OpenGL!"),
tr("Your GPU may not support OpenGL 3.3, or you do not "
"have the latest graphics driver."));
case Core::System::ResultStatus::ErrorVideoCore:
QMessageBox::critical(
this, tr("An error occured in the video core."),
tr("Citra has encountered an error while running the video core, please see the "
"log for more details."
"For more information on accessing the log, please see the following page: "
"<a href='https://community.citra-emu.org/t/how-to-upload-the-log-file/296'>How "
"to "
"Upload the Log File</a>."
"Ensure that you have the latest graphics drivers for your GPU."));
break;
default:
@ -632,9 +639,6 @@ void GMainWindow::UpdateStatusBar() {
}
void GMainWindow::OnCoreError(Core::System::ResultStatus result) {
// Waiting for the dialog to be closed before shutting down causes a segfault, maybe because of
// the profiler
ShutdownGame();
switch (result) {
case Core::System::ResultStatus::ErrorSystemFiles:
QMessageBox::critical(
@ -664,13 +668,13 @@ void GMainWindow::OnCoreError(Core::System::ResultStatus result) {
".");
break;
case Core::System::ResultStatus::ErrorUnknown:
default:
QMessageBox::critical(
this, "Fatal Error",
"Citra has encountered a fatal error, please see the log for more details.");
break;
default:
"Citra has encountered a fatal error, please see the log for more details. "
"For more information on accessing the log, please see the following page: "
"<a href='https://community.citra-emu.org/t/how-to-upload-the-log-file/296'>How to "
"Upload the Log File</a>.");
break;
}
}
@ -679,9 +683,10 @@ bool GMainWindow::ConfirmClose() {
if (emu_thread == nullptr || !UISettings::values.confirm_before_closing)
return true;
return QMessageBox::question(this, tr("Citra"), tr("Are you sure you want to close Citra?"),
QMessageBox::Yes | QMessageBox::No,
QMessageBox::No) != QMessageBox::No;
auto answer =
QMessageBox::question(this, tr("Citra"), tr("Are you sure you want to close Citra?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
return answer != QMessageBox::No;
}
void GMainWindow::closeEvent(QCloseEvent* event) {