diff options
| author | 2016-12-17 01:20:47 -0500 | |
|---|---|---|
| committer | 2016-12-21 23:48:14 -0500 | |
| commit | 5ac5cbeab7387b2eabd4618291e223fd7189bb8b (patch) | |
| tree | e035f870b86f930876a5ced2c1e2be9f6a087a91 /src/citra_qt/main.cpp | |
| parent | core: Remove HLE module, consolidate code & various cleanups. (diff) | |
| download | yuzu-5ac5cbeab7387b2eabd4618291e223fd7189bb8b.tar.gz yuzu-5ac5cbeab7387b2eabd4618291e223fd7189bb8b.tar.xz yuzu-5ac5cbeab7387b2eabd4618291e223fd7189bb8b.zip | |
Address clang-format issues.
Diffstat (limited to 'src/citra_qt/main.cpp')
| -rw-r--r-- | src/citra_qt/main.cpp | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index e27c09b53..6d59cf640 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp | |||
| @@ -283,49 +283,48 @@ bool GMainWindow::LoadROM(const std::string& filename) { | |||
| 283 | 283 | ||
| 284 | if (!gladLoadGL()) { | 284 | if (!gladLoadGL()) { |
| 285 | QMessageBox::critical(this, tr("Error while starting Citra!"), | 285 | QMessageBox::critical(this, tr("Error while starting Citra!"), |
| 286 | tr("Failed to initialize the video core!\n\n" | 286 | tr("Failed to initialize the video core!\n\n" |
| 287 | "Please ensure that your GPU supports OpenGL 3.3 and that you " | 287 | "Please ensure that your GPU supports OpenGL 3.3 and that you " |
| 288 | "have the latest graphics driver.")); | 288 | "have the latest graphics driver.")); |
| 289 | return false; | 289 | return false; |
| 290 | } | 290 | } |
| 291 | 291 | ||
| 292 | Core::System& system{ Core::System::GetInstance() }; | 292 | Core::System& system{Core::System::GetInstance()}; |
| 293 | 293 | ||
| 294 | const Core::System::ResultStatus result{ system.Load(render_window, filename) }; | 294 | const Core::System::ResultStatus result{system.Load(render_window, filename)}; |
| 295 | 295 | ||
| 296 | if (result != Core::System::ResultStatus::Success) { | 296 | if (result != Core::System::ResultStatus::Success) { |
| 297 | switch (result) { | 297 | switch (result) { |
| 298 | case Core::System::ResultStatus::ErrorGetLoader: | 298 | case Core::System::ResultStatus::ErrorGetLoader: |
| 299 | LOG_CRITICAL(Frontend, "Failed to obtain loader for %s!", filename.c_str()); | 299 | LOG_CRITICAL(Frontend, "Failed to obtain loader for %s!", filename.c_str()); |
| 300 | QMessageBox::critical(this, tr("Error while loading ROM!"), | 300 | QMessageBox::critical(this, tr("Error while loading ROM!"), |
| 301 | tr("The ROM format is not supported.")); | 301 | tr("The ROM format is not supported.")); |
| 302 | break; | 302 | break; |
| 303 | 303 | ||
| 304 | case Core::System::ResultStatus::ErrorSystemMode: | 304 | case Core::System::ResultStatus::ErrorSystemMode: |
| 305 | LOG_CRITICAL(Frontend, "Failed to load ROM!"); | 305 | LOG_CRITICAL(Frontend, "Failed to load ROM!"); |
| 306 | QMessageBox::critical(this, tr("Error while loading ROM!"), | 306 | QMessageBox::critical(this, tr("Error while loading ROM!"), |
| 307 | tr("Could not determine the system mode.")); | 307 | tr("Could not determine the system mode.")); |
| 308 | break; | 308 | break; |
| 309 | 309 | ||
| 310 | case Core::System::ResultStatus::ErrorLoader_ErrorEncrypted: | 310 | case Core::System::ResultStatus::ErrorLoader_ErrorEncrypted: { |
| 311 | { | ||
| 312 | // Build the MessageBox ourselves to have clickable link | 311 | // Build the MessageBox ourselves to have clickable link |
| 313 | QMessageBox popup_error; | 312 | QMessageBox popup_error; |
| 314 | popup_error.setTextFormat(Qt::RichText); | 313 | popup_error.setTextFormat(Qt::RichText); |
| 315 | popup_error.setWindowTitle(tr("Error while loading ROM!")); | 314 | popup_error.setWindowTitle(tr("Error while loading ROM!")); |
| 316 | popup_error.setText( | 315 | popup_error.setText( |
| 317 | tr("The game that you are trying to load must be decrypted before being used with " | 316 | tr("The game that you are trying to load must be decrypted before being used with " |
| 318 | "Citra.<br/><br/>" | 317 | "Citra.<br/><br/>" |
| 319 | "For more information on dumping and decrypting games, please see: <a " | 318 | "For more information on dumping and decrypting games, please see: <a " |
| 320 | "href='https://citra-emu.org/wiki/Dumping-Game-Cartridges'>https://" | 319 | "href='https://citra-emu.org/wiki/Dumping-Game-Cartridges'>https://" |
| 321 | "citra-emu.org/wiki/Dumping-Game-Cartridges</a>")); | 320 | "citra-emu.org/wiki/Dumping-Game-Cartridges</a>")); |
| 322 | popup_error.setIcon(QMessageBox::Critical); | 321 | popup_error.setIcon(QMessageBox::Critical); |
| 323 | popup_error.exec(); | 322 | popup_error.exec(); |
| 324 | break; | 323 | break; |
| 325 | } | 324 | } |
| 326 | case Core::System::ResultStatus::ErrorLoader_ErrorInvalidFormat: | 325 | case Core::System::ResultStatus::ErrorLoader_ErrorInvalidFormat: |
| 327 | QMessageBox::critical(this, tr("Error while loading ROM!"), | 326 | QMessageBox::critical(this, tr("Error while loading ROM!"), |
| 328 | tr("The ROM format is not supported.")); | 327 | tr("The ROM format is not supported.")); |
| 329 | break; | 328 | break; |
| 330 | 329 | ||
| 331 | default: | 330 | default: |