[RFC] Shutdown rewrite for 1.5.x, version 0.4

Message ID 45E0B4A4.7010804@gmx.de
State New
Headers

Commit Message

Udo Richter Feb. 24, 2007, 9:56 p.m. UTC
  Udo Richter wrote:
> I've finished a fourth version of the shutdown rewrite. Again there are 
> two patches available, one for VDR 1.5.0, and one with slight changes 
> for 1.4.x.
> 
> Changes:
> - Handle setup menu restart questions in cShutdown::ConfirmRestart()
> - Act differently on SIGHUP:
>   Restart VDR like on setup menu restart, but dont ask questions.

Well, that was the intention. Next time I'll do it, promise! ;)

The attached patch fixes this and actually calls ConfirmRestart, not 
ConfirmShutdown.

Beside that, things are getting close to land in VDR 1.5.x, so any last 
minute bug hunting is welcome.

Cheers,

Udo
  

Patch

--- vdr.c.old	2007-02-24 22:36:26.707746080 +0100
+++ vdr.c	2007-02-24 22:38:21.012241392 +0100
@@ -1169,7 +1169,7 @@ 
         if (LastSignal == SIGHUP) {
            LastSignal = 0;
            // Confirm for any activity that blocks a restart
-           if (!Shutdown.ConfirmShutdown(true)) 
+           if (!Shutdown.ConfirmRestart(true)) 
               // Not confirmed, cancel.
               break;
           
--- menu.c.old	2007-02-24 22:36:23.037304072 +0100
+++ menu.c	2007-02-24 22:38:15.016152936 +0100
@@ -2726,7 +2726,7 @@ 
      return osContinue;
     
   // Confirm for any activity that blocks a restart
-  if (!Shutdown.ConfirmShutdown(true)) 
+  if (!Shutdown.ConfirmRestart(true)) 
      // Not confirmed, cancel.
      return osContinue;