1 files changed, 3 insertions, 0 deletions
diff --git a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
index 14c7a03a36..c434cc24b3 100644
--- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
+++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java
@@ -953,6 +953,7 @@ public class QtActivityDelegate
     {
         if (m_quitApp) {
             QtNative.terminateQt();
+            QtNative.setActivity(null, null);
             if (m_debuggerProcess != null)
                 m_debuggerProcess.destroy();
             System.exit(0);// FIXME remove it or find a better way
@@ -1200,6 +1201,8 @@ public class QtActivityDelegate
 
     private void setActionBarVisibility(boolean visible)
     {
+        if (m_activity.getActionBar() == null)
+            return;
         if (ViewConfiguration.get(m_activity).hasPermanentMenuKey() || !visible)
             m_activity.getActionBar().hide();
         else