diff options
| author | Leo Lam <leolino.lam@gmail.com> | 2017-09-15 18:45:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-09-15 18:45:17 +0200 |
| commit | 0d078219358b04266206ea1e2622396db7724136 (patch) | |
| tree | efafafd00041afae7f3d390e19a0a4a5d650f9fe /Source/Core/InputCommon/GCAdapter_Android.cpp | |
| parent | 30dd544931575f5136bc4a5cc972d0f3c55979c5 (diff) | |
| parent | 3e1072b24dd8f60fd13b9aca3527066d478f9774 (diff) | |
Merge pull request #6024 from ligfx/coreonstatechangedcallback
Qt: use Settings::EmulationStateChanged
Diffstat (limited to 'Source/Core/InputCommon/GCAdapter_Android.cpp')
| -rw-r--r-- | Source/Core/InputCommon/GCAdapter_Android.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Source/Core/InputCommon/GCAdapter_Android.cpp b/Source/Core/InputCommon/GCAdapter_Android.cpp index 7b0c6e1545..d8628530a3 100644 --- a/Source/Core/InputCommon/GCAdapter_Android.cpp +++ b/Source/Core/InputCommon/GCAdapter_Android.cpp @@ -195,7 +195,7 @@ void Init() if (s_fd) return; - if (Core::GetState() != Core::State::Uninitialized) + if (Core::GetState() != Core::State::Uninitialized && Core::GetState() != Core::State::Starting) { if ((CoreTiming::GetTicks() - s_last_init) < SystemTimers::GetTicksPerSecond()) return; |