Ticket #6066: patch.diff

mythtv-0-23/mythtv/programs/mythbackend/scheduler.cpp

@@ -2054 +2054 @@
                         for ( ; idleIter != reclist.end(); idleIter++)
                             if ((*idleIter)->recstatus == rsWillRecord)
                                 break;
-
+    
                         if (idleIter != reclist.end())
                         {
                             if (curtime.secsTo((*idleIter)->recstartts) -
-                                prerollseconds > idleWaitForRecordingTime * 60)
+                                prerollseconds >                      
+                                (idleWaitForRecordingTime * 60) +
+                                idleTimeoutSecs)
                             {
                                 idleSince = curtime;
                             }
@@ -2096 +2098 @@
                         {
                             int itime = idleSince.secsTo(curtime);
                             QString msg;
+                            
                             if (itime == 1)
                             {
                                 msg = QString("I\'m idle now... shutdown will "

mythtv-0-23/mythtv/programs/mythwelcome/welcomedialog.h

@@ -72 +72 @@
     QDateTime      m_nextRecordingStart;
     int            m_preRollSeconds;
     int            m_idleWaitForRecordingTime;
+    int            m_idleTimeoutSecs;
     uint           m_screenTunerNo;
     uint           m_screenScheduledNo;
     uint           m_statusListNo;

mythtv-0-23/mythtv/programs/mythwelcome/welcomedialog.cpp

@@ -37 +37 @@
     m_secondsToShutdown(-1),   m_preRollSeconds(0),    m_idleWaitForRecordingTime(0),
     m_screenTunerNo(0),        m_screenScheduledNo(0), m_statusListNo(0),
     m_frontendIsRunning(false),m_pendingRecListUpdate(false),
-    m_pendingSchedUpdate(false)
+    m_pendingSchedUpdate(false),                       m_idleTimeoutSecs(0)
 {
     gContext->addListener(this);
 
@@ -52 +52 @@
 
     // if idleTimeoutSecs is 0, the user disabled the auto-shutdown feature
     m_bWillShutdown = (gContext->GetNumSetting("idleTimeoutSecs", 0) != 0);
+    
+    m_idleTimeoutSecs = gContext->GetNumSetting("idleTimeoutSecs", 0);
 
     connect(m_updateStatusTimer, SIGNAL(timeout()),
             this, SLOT(updateStatus()));
@@ -517 +519 @@
     QDateTime curtime = QDateTime::currentDateTime();
 
     if (!m_isRecording && !m_nextRecordingStart.isNull() && 
-            curtime.secsTo(m_nextRecordingStart) - 
-            m_preRollSeconds < m_idleWaitForRecordingTime * 60)
+        curtime.secsTo(m_nextRecordingStart) - m_preRollSeconds < 
+        (m_idleWaitForRecordingTime * 60) + m_idleTimeoutSecs)
     {
          m_statusList.append(tr("MythTV is about to start recording."));
     }
@@ -664 +666 @@
 
     // don't shutdown if we are about to start recording
     if (!m_nextRecordingStart.isNull() && 
-            curtime.secsTo(m_nextRecordingStart) -
-            m_preRollSeconds < m_idleWaitForRecordingTime * 60)
+        curtime.secsTo(m_nextRecordingStart) - m_preRollSeconds < 
+        (m_idleWaitForRecordingTime * 60) + m_idleTimeoutSecs)
     {
         MythPopupBox::showOkPopup(gContext->GetMainWindow(), "Cannot shutdown",
                 tr("Cannot shutdown because MythTV is about to start recording"));