Ticket #4960: startinwatchlist.diff

mythtv/programs/mythfrontend/playbackbox.cpp

@@ -299 +299 @@
     // Split out sort order modes, wacky order for backward compatibility
     m_listOrder = (pbOrder >> 1) ^ (m_allOrder = pbOrder & 1);
     m_watchListStart     = gContext->GetNumSetting("PlaybackWLStart", 0);
+
     m_watchListAutoExpire= gContext->GetNumSetting("PlaybackWLAutoExpire", 0);
     m_watchListMaxAge    = gContext->GetNumSetting("PlaybackWLMaxAge", 60);
     m_watchListBlackOut  = gContext->GetNumSetting("PlaybackWLBlackOut", 2);
@@ -314 +315 @@
                                     "DisplayGroupDefaultViewMask",
                                     VIEW_TITLES | VIEW_WATCHED);
 
+    // If user wants to start in watchlist and watchlist is display, then
+    // make it the current group
+    if (m_watchListStart && (m_viewMask & VIEW_WATCHLIST))
+        m_currentGroup = m_watchGroupLabel;
+
     // Translate these external settings into mask values
     if (gContext->GetNumSetting("PlaybackWatchList", 1) &&
         !(m_viewMask & VIEW_WATCHLIST))
@@ -1078 +1084 @@
             }
         }
 
-        if (!(m_viewMask & VIEW_WATCHLIST))
-            m_watchListStart = 0;
-
         vector<ProgramInfo *>::iterator i = m_progCache->begin();
         for ( ; i != m_progCache->end(); i++)
         {