Ticket #9038: 9038_fixes.diff

programs/mythfrontend/guidegrid.cpp

@@ -166 +166 @@
 void GuideGrid::RunProgramGuide(uint chanid, const QString &channum,
                     TV *player, bool embedVideo, bool allowFinder, int changrpid)
 {
+    // which channel group should we default to
+    if (changrpid == -2)
+        changrpid = gContext->GetNumSetting("ChannelGroupDefault", -1);
+
     // check there are some channels setup
     DBChanList channels = ChannelUtil::GetChannels(0, true, "", changrpid);
     if (!channels.size())
@@ -404 +408 @@
     // tell the player to update its channel list just in case
     if (m_player)
         m_player->UpdateChannelList(m_changrpid);
+
+    if (gContext->GetNumSetting("ChannelGroupRememberLast", 0))
+        gContext->SaveSetting("ChannelGroupDefault", m_changrpid);
 }
 
 bool GuideGrid::keyPressEvent(QKeyEvent *event)

programs/mythfrontend/main.cpp

@@ -224 +224 @@
     uint chanid = 0;
     QString channum = gContext->GetSetting("DefaultTVChannel");
     channum = (channum.isEmpty()) ? "3" : channum;
-    GuideGrid::RunProgramGuide(chanid, channum);
+    GuideGrid::RunProgramGuide(chanid, channum, NULL, false, true, -2);
 }
 
 void startFinder(void)

programs/mythfrontend/progfind.cpp

@@ -403 +403 @@
         if (startchannel.isEmpty())
             startchannel = '3';
         uint startchanid = 0;
-        GuideGrid::RunProgramGuide(startchanid, startchannel, m_player, m_embedVideo, false);
+        GuideGrid::RunProgramGuide(startchanid, startchannel, m_player, m_embedVideo, false, -2);
     }
 }