summaryrefslogtreecommitdiff
path: root/Source/Core/InputCommon/GCAdapter_Android.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'Source/Core/InputCommon/GCAdapter_Android.cpp')
-rw-r--r--Source/Core/InputCommon/GCAdapter_Android.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/InputCommon/GCAdapter_Android.cpp b/Source/Core/InputCommon/GCAdapter_Android.cpp
index 1e58733236..b129eaaf0f 100644
--- a/Source/Core/InputCommon/GCAdapter_Android.cpp
+++ b/Source/Core/InputCommon/GCAdapter_Android.cpp
@@ -41,7 +41,7 @@ static u8 s_controller_rumble[4];
// Input handling
static std::mutex s_read_mutex;
static std::array<u8, 37> s_controller_payload;
-static std::atomic<int> s_controller_payload_size{0};
+static int s_controller_payload_size{0};
// Output handling
static std::mutex s_write_mutex;
@@ -164,7 +164,7 @@ static void Read()
{
std::lock_guard<std::mutex> lk(s_read_mutex);
std::copy(java_data, java_data + s_controller_payload.size(), s_controller_payload.begin());
- s_controller_payload_size.store(read_size);
+ s_controller_payload_size = read_size;
}
env->ReleaseByteArrayElements(*java_controller_payload, java_data, 0);
@@ -284,7 +284,7 @@ GCPadStatus Input(int chan)
{
std::lock_guard<std::mutex> lk(s_read_mutex);
controller_payload_copy = s_controller_payload;
- payload_size = s_controller_payload_size.load();
+ payload_size = s_controller_payload_size;
}
GCPadStatus pad = {};