diff options
| author | Albert Astals Cid <aacid@kde.org> | 2023-09-12 10:22:27 +0200 |
|---|---|---|
| committer | Timur Pocheptsov <timur.pocheptsov@qt.io> | 2023-09-13 22:09:54 +0000 |
| commit | ae83f327cd812c199304159fc9bbd93f4a728fdb (patch) | |
| tree | d062e50b6376ef415968ff0cd9551bb8599c3623 /src/plugins/platforms/ios/qiosviewcontroller.mm | |
| parent | 549ed4fb24f510cc268552ce365ecc812f9be2ba (diff) | |
ios: Fix crash when closing app while showing a native screen
Fixes: QTBUG-117021
Pick-to: 6.6 6.5
Change-Id: Icebae0e815b42c6e0bf39e727fd1a16db5752d78
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Diffstat (limited to 'src/plugins/platforms/ios/qiosviewcontroller.mm')
| -rw-r--r-- | src/plugins/platforms/ios/qiosviewcontroller.mm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/platforms/ios/qiosviewcontroller.mm b/src/plugins/platforms/ios/qiosviewcontroller.mm index c4e8968232..6f157353df 100644 --- a/src/plugins/platforms/ios/qiosviewcontroller.mm +++ b/src/plugins/platforms/ios/qiosviewcontroller.mm @@ -107,8 +107,11 @@ { Q_UNUSED(subview); - Q_ASSERT(self.window); UIWindow *uiWindow = self.window; + // uiWindow can be null when closing from the ios "app manager" and the app is + // showing a native window like UIDocumentBrowserViewController + if (!uiWindow) + return; if (uiWindow.screen != [UIScreen mainScreen] && self.subviews.count == 1) { // We're about to remove the last view of an external screen, so go back |