From d98df9e929bd53c1d72ded2eca4e2ade899d01ba Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Tue, 2 Sep 2014 09:42:31 +0200 Subject: Android: don't recreate surface on shutdown When we suspend the app, we destroy the surface to save resources. We don't want to create it again just as we are shutting down. Task-number: QTBUG-41072 Change-Id: I7a616249bee869b92716d0911201a80d73c2f8da Reviewed-by: Christian Stromme --- src/plugins/platforms/android/qandroideventdispatcher.h | 1 + src/plugins/platforms/android/qandroidplatformopenglwindow.cpp | 4 ++++ 2 files changed, 5 insertions(+) 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 #include @@ -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) { -- cgit v1.2.3