diff options
| author | Markus Wick <degasus@users.noreply.github.com> | 2016-05-19 22:58:06 +0200 |
|---|---|---|
| committer | Markus Wick <degasus@users.noreply.github.com> | 2016-05-19 22:58:06 +0200 |
| commit | bb6604df767212affdbd1087d305709d9d83dc13 (patch) | |
| tree | 4e2c2ca2621eecdf94b52cfb6d9c5b954760d91e /Source/Core/InputCommon/GCAdapter_Android.cpp | |
| parent | f1f8bf4d80e95bdb4f84c01c15f7bd27f0c9d8fb (diff) | |
| parent | 1bbbe92cd203d39f0aa0da80d5bd41ae641c3e5c (diff) | |
Merge pull request #3805 from mathieui/gcadapter-unplug-crash
GCAdapter: improve thread safety
Diffstat (limited to 'Source/Core/InputCommon/GCAdapter_Android.cpp')
| -rw-r--r-- | Source/Core/InputCommon/GCAdapter_Android.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/Source/Core/InputCommon/GCAdapter_Android.cpp b/Source/Core/InputCommon/GCAdapter_Android.cpp index 46ec417f2b..b05a066478 100644 --- a/Source/Core/InputCommon/GCAdapter_Android.cpp +++ b/Source/Core/InputCommon/GCAdapter_Android.cpp @@ -24,6 +24,9 @@ extern JavaVM* g_java_vm; namespace GCAdapter { +static void Setup(); +static void Reset(); + // Java classes static jclass s_adapter_class; @@ -207,7 +210,7 @@ void Init() StartScanThread(); } -void Setup() +static void Setup() { s_fd = 0; s_detected = true; @@ -220,7 +223,7 @@ void Setup() s_read_adapter_thread = std::thread(Read); } -void Reset() +static void Reset() { if (!s_detected) return; |