diff options
author | Klaus Schmidinger <kls (at) cadsoft (dot) de> | 2006-04-30 18:00:00 +0200 |
---|---|---|
committer | Klaus Schmidinger <kls (at) cadsoft (dot) de> | 2006-04-30 18:00:00 +0200 |
commit | 529fc7b48aa8e2d6f3b66b1f0a473ee7bbad16c2 (patch) | |
tree | 041c5101740f4e991820882ccc1d215124b5f3ef /vdr.c | |
parent | 56e5836b54ab1a7f5ad5b067e867a0c9392c5e5b (diff) | |
download | vdr-patch-lnbsharing-529fc7b48aa8e2d6f3b66b1f0a473ee7bbad16c2.tar.gz vdr-patch-lnbsharing-529fc7b48aa8e2d6f3b66b1f0a473ee7bbad16c2.tar.bz2 |
Version 1.4.0vdr-1.4.0
- Fixed handling the "Power" key in case a recording is going on and no plugin
is active (thanks to Udo Richter; bug reported by Dominique Simon).
- Updated the Polish OSD texts (thanks to Jaroslaw Swierczynski).
- Fixed a memory leak in handling external EPG data (thanks to Tobias Grimm).
- Fixed a memory leak in closing the video file during replay (thanks to Tobias Grimm).
- Updated the Italian OSD texts (thanks to Nino Gerbino and Antonio Ospite).
- Updated the Estonian OSD texts (thanks to Arthur Konovalov).
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 |