summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2007-10-13 10:12:28 +0200
committerKlaus Schmidinger <vdr@tvdr.de>2007-10-13 10:12:28 +0200
commit8945e9e296a915a2e17e692a8e6d3737e1a8d326 (patch)
treeb175f74a26e1799b070ee62580a61721c95feb4d
parent59bc94fba2e14243b0fc1815f833f6d7c146c814 (diff)
downloadvdr-8945e9e296a915a2e17e692a8e6d3737e1a8d326.tar.gz
vdr-8945e9e296a915a2e17e692a8e6d3737e1a8d326.tar.bz2
Added a missing Channels.SetModified(true) call when deleting or moving a channel in the Channels menu
-rw-r--r--CONTRIBUTORS4
-rw-r--r--HISTORY2
-rw-r--r--menu.c4
3 files changed, 9 insertions, 1 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 4cd65b55..34450086 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -2175,3 +2175,7 @@ Bruno Roussel <bruno.roussel@free.fr>
Matthias Becker <becker.matthias@gmail.com>
for suggesting to add a new i18n macro that can be used by plugins to mark
texts they want to reuse from VDR's core translations
+
+Halim Sahin <halim.sahin@t-online.de>
+ for reporting that the channels.conf file was not written when stopping VDR after
+ deleting or moving a channel in the Channels menu
diff --git a/HISTORY b/HISTORY
index c18d7916..04d75134 100644
--- a/HISTORY
+++ b/HISTORY
@@ -5449,3 +5449,5 @@ Video Disk Recorder Revision History
large diffs. Plugin authors may want to replace the -F option with
--no-location in the xgettext and msgmerge calls in their Makefiles.
- Updated the Finnish OSD texts (thanks to Rolf Ahrenberg).
+- Added a missing Channels.SetModified(true) call when deleting or moving a
+ channel in the Channels menu (reported by Halim Sahin).
diff --git a/menu.c b/menu.c
index 9a0123cc..853d1e76 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* how to reach the author.
*
- * $Id: menu.c 1.462 2007/10/12 14:30:29 kls Exp $
+ * $Id: menu.c 1.463 2007/10/13 10:10:20 kls Exp $
*/
#include "menu.h"
@@ -525,6 +525,7 @@ eOSState cMenuChannels::Delete(void)
Channels.Del(channel);
cOsdMenu::Del(Index);
Propagate();
+ Channels.SetModified(true);
isyslog("channel %d deleted", DeletedChannel);
if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) {
if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
@@ -549,6 +550,7 @@ void cMenuChannels::Move(int From, int To)
Channels.Move(FromChannel, ToChannel);
cOsdMenu::Move(From, To);
Propagate();
+ Channels.SetModified(true);
isyslog("channel %d moved to %d", FromNumber, ToNumber);
if (CurrentChannel && CurrentChannel->Number() != CurrentChannelNr) {
if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())