diff options
| author | bunnei <bunneidev@gmail.com> | 2016-03-08 23:12:04 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2016-03-08 23:12:04 -0500 |
| commit | 8530a2d7df7f9546e3d4e9be2cec633307a28c23 (patch) | |
| tree | 9bcf963cc1a7c8c5700afe926fd43c08b2aaff96 /src/core/system.cpp | |
| parent | 58c336b67109e89b3d47e2873e8271e7291a59d0 (diff) | |
| parent | 4be68dddfbdc7065139351e6e39b5fa97844264a (diff) | |
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.cpp | 6 |
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(); } |