diff options
| author | 2016-03-08 23:12:04 -0500 | |
|---|---|---|
| committer | 2016-03-08 23:12:04 -0500 | |
| commit | 8530a2d7df7f9546e3d4e9be2cec633307a28c23 (patch) | |
| tree | 9bcf963cc1a7c8c5700afe926fd43c08b2aaff96 /src/core/core.cpp | |
| parent | Merge pull request #1441 from MerryMage/dsp-pipes (diff) | |
| parent | Improve error report from Init() functions (diff) | |
| download | yuzu-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/core.cpp')
| -rw-r--r-- | src/core/core.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/core.cpp b/src/core/core.cpp index 453c7162d..84d6c392e 100644 --- a/src/core/core.cpp +++ b/src/core/core.cpp | |||
| @@ -73,12 +73,11 @@ void Stop() { | |||
| 73 | } | 73 | } |
| 74 | 74 | ||
| 75 | /// Initialize the core | 75 | /// Initialize the core |
| 76 | int Init() { | 76 | void Init() { |
| 77 | g_sys_core = Common::make_unique<ARM_DynCom>(USER32MODE); | 77 | g_sys_core = Common::make_unique<ARM_DynCom>(USER32MODE); |
| 78 | g_app_core = Common::make_unique<ARM_DynCom>(USER32MODE); | 78 | g_app_core = Common::make_unique<ARM_DynCom>(USER32MODE); |
| 79 | 79 | ||
| 80 | LOG_DEBUG(Core, "Initialized OK"); | 80 | LOG_DEBUG(Core, "Initialized OK"); |
| 81 | return 0; | ||
| 82 | } | 81 | } |
| 83 | 82 | ||
| 84 | void Shutdown() { | 83 | void Shutdown() { |