2 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/platforms/android/qandroideventdispatcher.h b/src/plugins/platforms/android/qandroideventdispatcher.h
index 284c5fd392..295763ce5b 100644
--- a/src/plugins/platforms/android/qandroideventdispatcher.h
+++ b/src/plugins/platforms/android/qandroideventdispatcher.h
@@ -73,6 +73,7 @@ class QAndroidEventDispatcherStopper
 {
 public:
     static QAndroidEventDispatcherStopper *instance();
+    static bool stopped() {return !instance()->started; }
     void startAll();
     void stopAll();
     void addEventDispatcher(QAndroidEventDispatcher *dispatcher);
diff --git a/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp b/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp
index 73c0a76dd7..d3fb22094a 100644
--- a/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp
+++ b/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp
@@ -44,6 +44,7 @@
 
 #include "qandroidplatformscreen.h"
 #include "androidjnimain.h"
+#include "qandroideventdispatcher.h"
 
 #include <QSurfaceFormat>
 #include <QtGui/private/qwindow_p.h>
@@ -121,6 +122,9 @@ void QAndroidPlatformOpenGLWindow::setGeometry(const QRect &rect)
 
 EGLSurface QAndroidPlatformOpenGLWindow::eglSurface(EGLConfig config)
 {
+    if (QAndroidEventDispatcherStopper::stopped())
+        return m_eglSurface;
+
     QMutexLocker lock(&m_surfaceMutex);
 
     if (m_nativeSurfaceId == -1) {