Fixed|libappfw: Potential crash during shutdown

SubmenuAction may double-delete its popup in the situation where the popup is open during shutdown.
skyjake · May 8, 2016 · 5a51533 · 5a51533
1 parent ffdfd09
commit 5a51533
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/doomsday/sdk/libappfw/src/widgets/menuwidget.cpp b/doomsday/sdk/libappfw/src/widgets/menuwidget.cpp
@@ -120,7 +120,7 @@ DENG2_PIMPL(MenuWidget)
         SubmenuAction(MenuWidget::Instance *inst, ui::SubmenuItem const &parentItem)
             : SubAction(inst, parentItem)
         {
-            _sub = new PopupMenuWidget;
+            _sub.reset(new PopupMenuWidget);
             setWidget(_sub, parentItem.openingDirection());
 
             // Use the items from the submenu.
@@ -133,7 +133,7 @@ DENG2_PIMPL(MenuWidget)
         }
 
     private:
-        PopupMenuWidget *_sub; // owned
+        SafeWidgetPtr<PopupMenuWidget> _sub; // owned
     };
 
     /**