summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--menu.c6
-rw-r--r--svdrp.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/menu.c b/menu.c
index 5ec32ce6..1d72d886 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 4.14 2016/12/08 10:39:29 kls Exp $
+ * $Id: menu.c 4.15 2016/12/08 10:48:16 kls Exp $
*/
#include "menu.h"
@@ -520,7 +520,7 @@ eOSState cMenuChannels::Delete(void)
if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
Channels->SwitchTo(CurrentChannel->Number());
else
- cDevice::SetCurrentChannel(CurrentChannel);
+ cDevice::SetCurrentChannel(CurrentChannel->Number());
}
}
channelsStateKey.Remove(Deleted);
@@ -547,7 +547,7 @@ void cMenuChannels::Move(int From, int To)
if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
Channels->SwitchTo(CurrentChannel->Number());
else
- cDevice::SetCurrentChannel(CurrentChannel);
+ cDevice::SetCurrentChannel(CurrentChannel->Number());
}
}
channelsStateKey.Remove();
diff --git a/svdrp.c b/svdrp.c
index 81768e3e..1697cc6a 100644
--- a/svdrp.c
+++ b/svdrp.c
@@ -10,7 +10,7 @@
* and interact with the Video Disk Recorder - or write a full featured
* graphical interface that sits on top of an SVDRP connection.
*
- * $Id: svdrp.c 4.10 2016/12/08 09:51:02 kls Exp $
+ * $Id: svdrp.c 4.11 2016/12/08 10:48:53 kls Exp $
*/
#include "svdrp.h"
@@ -1244,7 +1244,7 @@ void cSVDRPServer::CmdDELC(const char *Option)
if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
Channels->SwitchTo(CurrentChannel->Number());
else
- cDevice::SetCurrentChannel(CurrentChannel);
+ cDevice::SetCurrentChannel(CurrentChannel->Number());
}
Reply(250, "Channel \"%s\" deleted", Option);
}
@@ -1903,7 +1903,7 @@ void cSVDRPServer::CmdMOVC(const char *Option)
if (!cDevice::PrimaryDevice()->Replaying() || cDevice::PrimaryDevice()->Transferring())
Channels->SwitchTo(CurrentChannel->Number());
else
- cDevice::SetCurrentChannel(CurrentChannel);
+ cDevice::SetCurrentChannel(CurrentChannel->Number());
}
isyslog("SVDRP < %s channel %d moved to %d", *connection, FromNumber, ToNumber);
Reply(250,"Channel \"%d\" moved to \"%d\"", From, To);