From 4be68dddfbdc7065139351e6e39b5fa97844264a Mon Sep 17 00:00:00 2001
From: LittleWhite <lw.demoscene@googlemail.com>
Date: Thu, 7 Jan 2016 20:33:54 +0100
Subject: Improve error report from Init() functions Add error popup when citra
initialization failed
---
src/core/system.cpp | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
(limited to 'src/core/system.cpp')
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();
}
--
cgit v1.2.3-70-g09d2