Ticket #4807: save_last_chan2.diff

tv_play.cpp

@@ -1501 +1501 @@
         lockTimerOn = false;
 
         SET_NEXT();
-        recorder->SpawnLiveTV(tvchain->GetID(), false, "");
+
+        uint chanid = gContext->GetNumSetting("DefaultChanid", 0);
+
+        if (chanid && !IsTunable(chanid))
+            chanid = 0;
+
+        if (chanid)
+        {
+            QStringList reclist;
+            QString channum;
+
+            MSqlQuery query(MSqlQuery::InitCon());
+            query.prepare("SELECT channum FROM channel "
+                          "WHERE chanid = :CHANID");
+            query.bindValue(":CHANID", chanid);
+            if (query.exec() && query.isActive() && query.size() > 0 && query.next())
+                channum = query.value(0).toString();
+            else
+                channum = QString::number(chanid);
+
+            bool getit = activerecorder->ShouldSwitchToAnotherCard(
+                QString::number(chanid));
+
+            if (getit)
+                reclist = GetValidRecorderList(chanid, channum);
+
+            if (reclist.size())
+            {
+                RemoteEncoder *testrec = NULL;
+                testrec = RemoteRequestFreeRecorderFromList(reclist);
+                if (testrec && testrec->IsValidRecorder())
+                {
+                    recorder = testrec;
+                    recorder->Setup();
+                    recorder->SpawnLiveTV(tvchain->GetID(), false, channum);
+                }
+            }
+            else
+                chanid = 0;
+        }
+
+        if (!chanid)
+            recorder->SpawnLiveTV(tvchain->GetID(), false, "");
 
         tvchain->ReloadAll();
 

NuppelVideoPlayer.cpp

@@ -1163 +1163 @@
 
     bookmarkseek = GetBookmark();
 
+    gContext->SaveSetting("DefaultChanid", m_playbackinfo->chanid);
+
     return IsErrored() ? -1 : 0;
 }