aboutsummaryrefslogtreecommitdiff
path: root/src/core/system.cpp
diff options
context:
space:
mode:
authorLittleWhite <lw.demoscene@googlemail.com>2016-01-07 20:33:54 +0100
committerLittleWhite <lw.demoscene@googlemail.com>2016-03-08 22:05:25 +0100
commit4be68dddfbdc7065139351e6e39b5fa97844264a (patch)
tree4b020326a58a7a4364b752cb731233cb6c264cd0 /src/core/system.cpp
parent7ad669a9115dfaf3271487269d8d8bcdf2c51e03 (diff)
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 b62ebf69e3..1e3b2783c2 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -17,14 +17,16 @@
namespace System {
-void Init(EmuWindow* emu_window) {
+Result Init(EmuWindow* emu_window) {
Core::Init();
CoreTiming::Init();
Memory::Init();
HW::Init();
Kernel::Init();
HLE::Init();
- VideoCore::Init(emu_window);
+ if (!VideoCore::Init(emu_window)) {
+ return Result::ErrorInitVideoCore;
+ }
AudioCore::Init();
GDBStub::Init();
}