summarylogtreecommitdiffstats
path: root/0021-Allow-resuming-native-app-when-Android-activity-is-r.patch
blob: 465e27ee01113280d03d053eefba3dc55e0b854f (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
From b4434ce5b0ce856ebce0fb9852e8fe6053628714 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 19 May 2025 20:59:10 +0200
Subject: [PATCH 21/21] Allow resuming native app when Android activity is
 re-created

Change-Id: I2f25d8c65e64921acbc3adf408ded9db771da022
---
 .../jar/src/org/qtproject/qt/android/QtActivityBase.java   | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/android/jar/src/org/qtproject/qt/android/QtActivityBase.java b/src/android/jar/src/org/qtproject/qt/android/QtActivityBase.java
index bc9d36cd1a4..f37a374a030 100644
--- a/src/android/jar/src/org/qtproject/qt/android/QtActivityBase.java
+++ b/src/android/jar/src/org/qtproject/qt/android/QtActivityBase.java
@@ -118,12 +118,13 @@ public class QtActivityBase extends Activity
 
             QtLoader.LoadingResult result = loader.loadQtLibraries();
 
-            if (result == QtLoader.LoadingResult.Succeeded) {
+            if (result == QtLoader.LoadingResult.Failed) {
+                showErrorDialog();
+            } else {
                 m_delegate.startNativeApplication(loader.getApplicationParameters(),
                         loader.getMainLibraryPath());
-            } else if (result == QtLoader.LoadingResult.Failed) {
-                showErrorDialog();
             }
+
         } catch (IllegalArgumentException e) {
             e.printStackTrace();
             showErrorDialog();
-- 
2.49.0