summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthew Parlane <parlane@gmail.com>2017-03-19 01:00:59 +1300
committerGitHub <noreply@github.com>2017-03-19 01:00:59 +1300
commitce034a8186f9e49b9aa86d676bbcf2aa5ab551b2 (patch)
tree33ab6967483300d70d2a1c9554740991fc8e5b00
parent08351aa3344afb1cb4872f9bd6b16ac281d12a01 (diff)
parent998a215a0dbda23b8c329d54b5e1d602e87d8690 (diff)
Merge pull request #5101 from JosJuice/es-launch-wii-menu
Display a different error message when failing to ES_Launch the Wii Menu
-rw-r--r--Source/Core/Core/IOS/ES/ES.cpp15
1 files changed, 12 insertions, 3 deletions
diff --git a/Source/Core/Core/IOS/ES/ES.cpp b/Source/Core/Core/IOS/ES/ES.cpp
index c62c81ce6b..7ca9dbde21 100644
--- a/Source/Core/Core/IOS/ES/ES.cpp
+++ b/Source/Core/Core/IOS/ES/ES.cpp
@@ -177,9 +177,18 @@ bool ES::LaunchPPCTitle(u64 title_id, bool skip_reload)
const DiscIO::CNANDContentLoader& content_loader = AccessContentDevice(title_id);
if (!content_loader.IsValid())
{
- PanicAlertT("Could not launch title %016" PRIx64 " because it is missing from the NAND.\n"
- "The emulated software will likely hang now.",
- title_id);
+ if (title_id == 0x0000000100000002)
+ {
+ PanicAlertT("Could not launch the Wii Menu because it is missing from the NAND.\n"
+ "The emulated software will likely hang now.",
+ title_id);
+ }
+ else
+ {
+ PanicAlertT("Could not launch title %016" PRIx64 " because it is missing from the NAND.\n"
+ "The emulated software will likely hang now.",
+ title_id);
+ }
return false;
}