summaryrefslogtreecommitdiff
path: root/src/core/system.cpp
diff options
context:
space:
mode:
authorGravatar bunnei2016-03-08 23:12:04 -0500
committerGravatar bunnei2016-03-08 23:12:04 -0500
commit8530a2d7df7f9546e3d4e9be2cec633307a28c23 (patch)
tree9bcf963cc1a7c8c5700afe926fd43c08b2aaff96 /src/core/system.cpp
parentMerge pull request #1441 from MerryMage/dsp-pipes (diff)
parentImprove error report from Init() functions (diff)
downloadyuzu-8530a2d7df7f9546e3d4e9be2cec633307a28c23.tar.gz
yuzu-8530a2d7df7f9546e3d4e9be2cec633307a28c23.tar.xz
yuzu-8530a2d7df7f9546e3d4e9be2cec633307a28c23.zip
Merge pull request #1344 from LittleWhite-tb/error-output
Output errors in GUI
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}