diff options
| author | Jules Blok <jules.blok@gmail.com> | 2014-06-20 03:26:06 +0200 |
|---|---|---|
| committer | Jules Blok <jules.blok@gmail.com> | 2014-07-08 21:21:24 +0200 |
| commit | 49eade69a3938b75c2ace7848161d30c845e940c (patch) | |
| tree | d478e0dc83e3e1fee91ab8586c7574c189f6ab73 /Source/Core | |
| parent | b30d5dccbe46c4bf9977a1437a826d082abebee0 (diff) | |
Core: Return CORE_STOPPING even if hardware is already uninitialized.
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/Core/Core.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/Core/Core/Core.cpp b/Source/Core/Core/Core.cpp index 245b489663..b5be916b1e 100644 --- a/Source/Core/Core/Core.cpp +++ b/Source/Core/Core/Core.cpp @@ -538,15 +538,17 @@ void SetState(EState _State) EState GetState() { + if (g_bStopping) + return CORE_STOPPING; + if (g_bHwInit) { if (CCPU::IsStepping()) return CORE_PAUSE; - else if (g_bStopping) - return CORE_STOPPING; else return CORE_RUN; } + return CORE_UNINITIALIZED; } |