Changeset 75988 in vbox for trunk/src

Timestamp:

Dec 5, 2018 5:44:56 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: QIManagerDialog: macOS: Do not assert on Window menu prepare/cleanup, it's now possible this menu isn't exist.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/extensions/QIManagerDialog.cpp

@@ -188 +188 @@
 #ifdef VBOX_WS_MAC
     /* Prepare 'Window' menu: */
-    AssertPtrReturnVoid(gpWindowMenuManager);
-    menuBar()->addMenu(gpWindowMenuManager->createMenu(this));
-    gpWindowMenuManager->addWindow(this);
+    if (gpWindowMenuManager)
+    {
+        menuBar()->addMenu(gpWindowMenuManager->createMenu(this));
+        gpWindowMenuManager->addWindow(this);
+    }
 #endif
 }
@@ -209 +211 @@
 #ifdef VBOX_WS_MAC
     /* Cleanup 'Window' menu: */
-    AssertPtrReturnVoid(gpWindowMenuManager);
-    gpWindowMenuManager->removeWindow(this);
-    gpWindowMenuManager->destroyMenu(this);
+    if (gpWindowMenuManager)
+    {
+        gpWindowMenuManager->removeWindow(this);
+        gpWindowMenuManager->destroyMenu(this);
+    }
 #endif
 }