diff options
author | Klaus Schmidinger <vdr@tvdr.de> | 2006-04-29 09:24:07 +0200 |
---|---|---|
committer | Klaus Schmidinger <vdr@tvdr.de> | 2006-04-29 09:24:07 +0200 |
commit | 42ce340670ed541260d49cabf0996aa628045b12 (patch) | |
tree | 31c3a46b4f1fc647ad9eab2aca536284c0cdefef /vdr.c | |
parent | 70297ef1741cb9f38decfd39d3e6b4a353bd891c (diff) | |
download | vdr-42ce340670ed541260d49cabf0996aa628045b12.tar.gz vdr-42ce340670ed541260d49cabf0996aa628045b12.tar.bz2 |
Fixed handling the "Power" key in case a recording is going on and no plugin is active
Diffstat (limited to 'vdr.c')
-rw-r--r-- | vdr.c | 34 |
1 files changed, 18 insertions, 16 deletions
@@ -22,7 +22,7 @@ * * The project's page is at http://www.cadsoft.de/vdr * - * $Id: vdr.c 1.266 2006/04/28 13:23:55 kls Exp $ + * $Id: vdr.c 1.267 2006/04/29 09:14:06 kls Exp $ */ #include <getopt.h> @@ -970,21 +970,23 @@ int main(int argc, char *argv[]) } break; // Power off: - case kPower: isyslog("Power button pressed"); - DELETE_MENU; - if (!Shutdown) { - Skins.Message(mtError, tr("Can't shutdown - option '-s' not given!")); - break; - } - if (cRecordControls::Active()) { - if (Interface->Confirm(tr("Recording - shut down anyway?"))) - ForceShutdown = true; - } - if (!cPluginManager::Active(tr("shut down anyway?"))) - ForceShutdown = true; - LastActivity = 1; // not 0, see below! - UserShutdown = true; - break; + case kPower: + isyslog("Power button pressed"); + DELETE_MENU; + if (!Shutdown) { + Skins.Message(mtError, tr("Can't shutdown - option '-s' not given!")); + break; + } + LastActivity = 1; // not 0, see below! + UserShutdown = true; + if (cRecordControls::Active()) { + if (!Interface->Confirm(tr("Recording - shut down anyway?"))) + break; + } + if (cPluginManager::Active(tr("shut down anyway?"))) + break; + ForceShutdown = true; + break; default: break; } Interact = Menu ? Menu : cControl::Control(); // might have been closed in the mean time |