summaryrefslogtreecommitdiffstats
path: root/src/core/system.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/system.cpp')
-rw-r--r--src/core/system.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/core/system.cpp b/src/core/system.cpp
index b62ebf69e..4a4757af3 100644
--- a/src/core/system.cpp
+++ b/src/core/system.cpp
@@ -17,16 +17,20 @@
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();
+
+ return Result::Success;
}
void Shutdown() {