summaryrefslogtreecommitdiff
path: root/src/core/system.cpp
diff options
context:
space:
mode:
authorGravatar LittleWhite2016-01-07 20:33:54 +0100
committerGravatar LittleWhite2016-03-08 22:05:25 +0100
commit4be68dddfbdc7065139351e6e39b5fa97844264a (patch)
tree4b020326a58a7a4364b752cb731233cb6c264cd0 /src/core/system.cpp
parentDisplay errors in GUI when loading ROM failed (diff)
downloadyuzu-4be68dddfbdc7065139351e6e39b5fa97844264a.tar.gz
yuzu-4be68dddfbdc7065139351e6e39b5fa97844264a.tar.xz
yuzu-4be68dddfbdc7065139351e6e39b5fa97844264a.zip
Improve error report from Init() functions
Add error popup when citra initialization failed
Diffstat (limited to 'src/core/system.cpp')
-rw-r--r--src/core/system.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/core/system.cpp b/src/core/system.cpp
index b62ebf69e..1e3b2783c 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -17,14 +17,16 @@
17 17
18namespace System { 18namespace System {
19 19
20void Init(EmuWindow* emu_window) { 20Result Init(EmuWindow* emu_window) {
21 Core::Init(); 21 Core::Init();
22 CoreTiming::Init(); 22 CoreTiming::Init();
23 Memory::Init(); 23 Memory::Init();
24 HW::Init(); 24 HW::Init();
25 Kernel::Init(); 25 Kernel::Init();
26 HLE::Init(); 26 HLE::Init();
27 VideoCore::Init(emu_window); 27 if (!VideoCore::Init(emu_window)) {
28 return Result::ErrorInitVideoCore;
29 }
28 AudioCore::Init(); 30 AudioCore::Init();
29 GDBStub::Init(); 31 GDBStub::Init();
30} 32}