122082: Show correct deck title and tab bar highlight after switching sidebar decks.

sfx2/source/sidebar/SidebarController.cxx

@@ -390,7 +390,6 @@ void SidebarController::UpdateConfigurations (void)
             maCurrentContext,
             mbIsDocumentReadOnly,
             mxFrame);
-        mpTabBar->SetDecks(aDecks);
 
         // Notify the tab bar about the updated set of decks.
         mpTabBar->SetDecks(aDecks);
@@ -422,13 +421,12 @@ void SidebarController::UpdateConfigurations (void)
             // We did not find a valid deck.
             RequestCloseDeck();
             return;
-
-            // Tell the tab bar to highlight the button associated
-            // with the deck.
-            mpTabBar->HighlightDeck(sNewDeckId);
         }
 
-        msCurrentDeckId = sNewDeckId;
+        // Tell the tab bar to highlight the button associated
+        // with the deck.
+        mpTabBar->HighlightDeck(sNewDeckId);
+
         SwitchToDeck(
             *ResourceManager::Instance().GetDeckDescriptor(sNewDeckId),
             maCurrentContext);