summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2015-08-08 13:49:04 -0700
committerRobin H. Johnson <robbat2@gentoo.org>2015-08-08 17:38:18 -0700
commit56bd759df1d0c750a065b8c845e93d5dfa6b549d (patch)
tree3f91093cdb475e565ae857f1c5a7fd339e2d781e /media-plugins/vdr-zaphistory/files
downloadgentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.gz
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.tar.bz2
gentoo-56bd759df1d0c750a065b8c845e93d5dfa6b549d.zip
proj/gentoo: Initial commit
This commit represents a new era for Gentoo: Storing the gentoo-x86 tree in Git, as converted from CVS. This commit is the start of the NEW history. Any historical data is intended to be grafted onto this point. Creation process: 1. Take final CVS checkout snapshot 2. Remove ALL ChangeLog* files 3. Transform all Manifests to thin 4. Remove empty Manifests 5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$ 5.1. Do not touch files with -kb/-ko keyword flags. Signed-off-by: Robin H. Johnson <robbat2@gentoo.org> X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
Diffstat (limited to 'media-plugins/vdr-zaphistory/files')
-rw-r--r--media-plugins/vdr-zaphistory/files/vdr-zaphistory-0.9.6-fix-crash-no-info.diff15
1 files changed, 15 insertions, 0 deletions
diff --git a/media-plugins/vdr-zaphistory/files/vdr-zaphistory-0.9.6-fix-crash-no-info.diff b/media-plugins/vdr-zaphistory/files/vdr-zaphistory-0.9.6-fix-crash-no-info.diff
new file mode 100644
index 000000000000..274012d731e4
--- /dev/null
+++ b/media-plugins/vdr-zaphistory/files/vdr-zaphistory-0.9.6-fix-crash-no-info.diff
@@ -0,0 +1,15 @@
+diff -Naur zaphistory-0.9.6.orig/zaphistoryosd.c zaphistory-0.9.6/zaphistoryosd.c
+--- zaphistory-0.9.6.orig/zaphistoryosd.c 2013-09-15 15:22:41.000000000 +0200
++++ zaphistory-0.9.6/zaphistoryosd.c 2013-09-15 15:24:42.000000000 +0200
+@@ -217,6 +217,11 @@
+
+ return AddSubMenu( new cMenuEvent(schedule->GetEventAround(time(NULL)) ) );
+
++ const cEvent *event = schedule->GetEventAround(time(NULL));
++ if (event)
++ return AddSubMenu( new cMenuEvent(event) );
++ else
++ return osUnknown;
+ }
+
+ eOSState cMenuZappedChannels::ProcessKey(eKeys Key)