From d0b8356e7efcb546bf8838b01b94840e4c0d3ab3 Mon Sep 17 00:00:00 2001
From: Vyacheslav Koscheev <v.koscheev@2gis.ru>
Date: Thu, 26 Jan 2017 14:07:48 +0700
Subject: Android: Fix data race in QAndroidEventDispatcherStopper

Change-Id: If5f8406d7af2d91e267a0ba380e73287feabac9f
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
---
 src/plugins/platforms/android/qandroideventdispatcher.cpp | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

(limited to 'src/plugins/platforms/android/qandroideventdispatcher.cpp')

diff --git a/src/plugins/platforms/android/qandroideventdispatcher.cpp b/src/plugins/platforms/android/qandroideventdispatcher.cpp
index 104e905b8f..e12551283f 100644
--- a/src/plugins/platforms/android/qandroideventdispatcher.cpp
+++ b/src/plugins/platforms/android/qandroideventdispatcher.cpp
@@ -108,10 +108,9 @@ QAndroidEventDispatcherStopper *QAndroidEventDispatcherStopper::instance()
 void QAndroidEventDispatcherStopper::startAll()
 {
     QMutexLocker lock(&m_mutex);
-    if (started)
+    if (!m_started.testAndSetOrdered(0, 1))
         return;
 
-    started = true;
     for (QAndroidEventDispatcher *d : qAsConst(m_dispatchers))
         d->start();
 }
@@ -119,10 +118,9 @@ void QAndroidEventDispatcherStopper::startAll()
 void QAndroidEventDispatcherStopper::stopAll()
 {
     QMutexLocker lock(&m_mutex);
-    if (!started)
+    if (!m_started.testAndSetOrdered(1, 0))
         return;
 
-    started = false;
     for (QAndroidEventDispatcher *d : qAsConst(m_dispatchers))
         d->stop();
 }
-- 
cgit v1.2.3