* [gentoo-commits] gentoo-x86 commit in media-plugins/vdr-vdrmanager/files: vdr-vdrmanager-0.9_vdr-2.1.2.diff
@ 2013-10-26 13:01 Joerg Bornkessel (hd_brummy)
0 siblings, 0 replies; 2+ messages in thread
From: Joerg Bornkessel (hd_brummy) @ 2013-10-26 13:01 UTC (permalink / raw
To: gentoo-commits
hd_brummy 13/10/26 13:01:10
Added: vdr-vdrmanager-0.9_vdr-2.1.2.diff
Log:
compile fix >=vdr-2.1.2
(Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key 34C2808A)
Revision Changes Path
1.1 media-plugins/vdr-vdrmanager/files/vdr-vdrmanager-0.9_vdr-2.1.2.diff
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-vdrmanager/files/vdr-vdrmanager-0.9_vdr-2.1.2.diff?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/vdr-vdrmanager/files/vdr-vdrmanager-0.9_vdr-2.1.2.diff?rev=1.1&content-type=text/plain
Index: vdr-vdrmanager-0.9_vdr-2.1.2.diff
===================================================================
diff -Naur vdr-vdrmanager-0.9.orig/helpers.cpp vdr-vdrmanager-0.9/helpers.cpp
--- vdr-vdrmanager-0.9.orig/helpers.cpp 2013-10-26 11:11:37.000000000 +0200
+++ vdr-vdrmanager-0.9/helpers.cpp 2013-10-26 11:20:59.000000000 +0200
@@ -272,12 +272,21 @@
cString FileName = recording->FileName();
+#if VDRVERSNUM > 20101
+ if (RecordingsHandler.GetUsage(FileName)) {
+ RecordingsHandler.Del(FileName);
+ recording = Recordings.GetByName(FileName); // RecordingsHandler.Del() might have deleted it if it was the edited version
+ // we continue with the code below even if recording is NULL,
+ // in order to have the menu updated etc.
+ }
+#else
if (cCutter::Active(recording->FileName())) {
cCutter::Stop();
recording = Recordings.GetByName(FileName); // cCutter::Stop() might have deleted it if it was the edited version
// we continue with the code below even if recording is NULL,
// in order to have the menu updated etc.
}
+#endif
if (cReplayControl::NowReplaying()
&& strcmp(cReplayControl::NowReplaying(), FileName) == 0) {
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-plugins/vdr-vdrmanager/files: vdr-vdrmanager-0.9_vdr-2.1.2.diff
@ 2014-08-31 11:42 Joerg Bornkessel (hd_brummy)
0 siblings, 0 replies; 2+ messages in thread
From: Joerg Bornkessel (hd_brummy) @ 2014-08-31 11:42 UTC (permalink / raw
To: gentoo-commits
hd_brummy 14/08/31 11:42:19
Removed: vdr-vdrmanager-0.9_vdr-2.1.2.diff
Log:
cleanup old
(Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 34C2808A)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-08-31 11:42 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-26 13:01 [gentoo-commits] gentoo-x86 commit in media-plugins/vdr-vdrmanager/files: vdr-vdrmanager-0.9_vdr-2.1.2.diff Joerg Bornkessel (hd_brummy)
-- strict thread matches above, loose matches on Subject: below --
2014-08-31 11:42 Joerg Bornkessel (hd_brummy)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox