Fixed|UI|Client: Update singleplayer session menu when game changes

The currently loaded game is disabled in the menu, so it has to be enabled when returning to ring zero.
skyjake · Apr 13, 2014 · 22f26f1 · 22f26f1
1 parent 65faca6
commit 22f26f1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/doomsday/client/src/ui/widgets/gameselectionwidget.cpp b/doomsday/client/src/ui/widgets/gameselectionwidget.cpp
@@ -231,6 +231,8 @@ DENG_GUI_PIMPL(GameSelectionWidget)
 
     ~Instance()
     {
+        foreach(SubsetWidget *sub, subsets) sub->menu->setFilter(0);
+
         App::app().audienceForGameChange() -= this;
     }
 

diff --git a/doomsday/client/src/ui/widgets/sessionmenuwidget.cpp b/doomsday/client/src/ui/widgets/sessionmenuwidget.cpp
@@ -113,7 +113,10 @@ void SessionMenuWidget::setColumns(int numberOfColumns)
 
 void SessionMenuWidget::sort()
 {
-    d->sortSessions();
+    if(d->filter)
+    {
+        d->sortSessions();
+    }
 }
 
 //--------------------------------------------------------------------------------------

diff --git a/doomsday/client/src/ui/widgets/singleplayersessionmenuwidget.cpp b/doomsday/client/src/ui/widgets/singleplayersessionmenuwidget.cpp
@@ -31,6 +31,7 @@ DENG_GUI_PIMPL(SingleplayerSessionMenuWidget)
 , DENG2_OBSERVES(Games, Addition)
 , DENG2_OBSERVES(Loop, Iteration) // deferred updates
 , DENG2_OBSERVES(App, StartupComplete)
+, DENG2_OBSERVES(App, GameChange)
 {
     /// ActionItem with a Game member, for loading a particular game.
     struct GameItem : public ui::ImageItem,
@@ -71,6 +72,7 @@ DENG_GUI_PIMPL(SingleplayerSessionMenuWidget)
     Instance(Public *i) : Base(i)
     {
         App_Games().audienceForAddition() += this;
+        App::app().audienceForGameChange() += this;
         App::app().audienceForStartupComplete() += this;
     }
 
@@ -79,6 +81,7 @@ DENG_GUI_PIMPL(SingleplayerSessionMenuWidget)
         Loop::appLoop().audienceForIteration() -= this;
 
         App_Games().audienceForAddition() -= this;
+        App::app().audienceForGameChange() -= this;
         App::app().audienceForStartupComplete() -= this;
     }
 
@@ -110,6 +113,7 @@ DENG_GUI_PIMPL(SingleplayerSessionMenuWidget)
     {
         Loop::appLoop().audienceForIteration() -= this;
         addPendingGames();
+        updateGameAvailability();
     }
 
     void addPendingGames()
@@ -173,6 +177,11 @@ DENG_GUI_PIMPL(SingleplayerSessionMenuWidget)
     {
         updateGameAvailability();
     }
+
+    void currentGameChanged(game::Game const &)
+    {
+        Loop::appLoop().audienceForIteration() += this;
+    }
 };
 
 SingleplayerSessionMenuWidget::SingleplayerSessionMenuWidget(Mode mode, String const &name)