From 1a358a052e422b72039ace2f803eb80f8a7e43b3 Mon Sep 17 00:00:00 2001 From: BogDan Vatra Date: Mon, 15 Feb 2016 13:39:11 +0200 Subject: Fix crash when using .NoActionBar theme. m_activity.getActionBar() returns null when a .NoActionBar theme is declared in AndroidManifest.xml file Change-Id: I671891d03913209c3f9f34a6f4dd8894c20de5c2 Reviewed-by: Christian Stromme --- src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/android') 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..985661bf3c 100644 --- a/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java +++ b/src/android/jar/src/org/qtproject/qt5/android/QtActivityDelegate.java @@ -1200,6 +1200,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 -- cgit v1.2.3