fix: quick change fullscreen state crash

Change-Id: If0ec5b64ecd8d96ba8bfa91e6681d2ffe44efa69
linuxdeepin · May 22, 2018 · 565bfd5 · 565bfd5
1 parent d33d8b0
commit 565bfd5
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/widgets/dtitlebar.cpp b/src/widgets/dtitlebar.cpp
@@ -235,7 +235,9 @@ bool DTitlebarPrivate::isVisableOnFullscreen()
 void DTitlebarPrivate::hideOnFullscreen()
 {
     D_Q(DTitlebar);
-    q->setProperty("_restore_height", q->height());
+    if (q->height() > 0) {
+        q->setProperty("_restore_height", q->height());
+    }
     q->setFixedHeight(0);
 }
 
@@ -265,8 +267,11 @@ void DTitlebarPrivate::updateFullscreen()
     } else {
         // must set to empty
         quitFullButton->show();
-        mainWindow->menuWidget()->setParent(nullptr);
-        mainWindow->setMenuWidget(Q_NULLPTR);
+        if (mainWindow->menuWidget()) {
+            mainWindow->menuWidget()->setParent(nullptr);
+            mainWindow->setMenuWidget(Q_NULLPTR);
+        }
+
         q->setParent(mainWindow);
         q->show();
         hideOnFullscreen();