Fixed a crash if no image is in the image directory.

(Portage version: 2.1.2.7)

5 files changed, 58 insertions, 1 deletions

diff --git a/media-plugins/vdr-dvdswitch/ChangeLog b/media-plugins/vdr-dvdswitch/ChangeLog
index 113620e697dc..8ef03b5828f3 100644
--- a/media-plugins/vdr-dvdswitch/ChangeLog
+++ b/media-plugins/vdr-dvdswitch/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-plugins/vdr-dvdswitch
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvdswitch/ChangeLog,v 1.11 2007/04/17 09:46:42 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvdswitch/ChangeLog,v 1.12 2007/05/28 09:06:59 zzam Exp $
+
+*vdr-dvdswitch-0.1.3-r1 (28 May 2007)
+
+  28 May 2007; Matthias Schwarzott <zzam@gentoo.org>
+  +files/0.1.3/no-files-crash.diff, +files/0.1.3/series,
+  +vdr-dvdswitch-0.1.3-r1.ebuild:
+  Fixed a crash if no image is in the image directory.
 
   17 Apr 2007; Matthias Schwarzott <zzam@gentoo.org> files/rc-addon.sh:
   Removed bash specific stuff.
diff --git a/media-plugins/vdr-dvdswitch/files/0.1.3/no-files-crash.diff b/media-plugins/vdr-dvdswitch/files/0.1.3/no-files-crash.diff
new file mode 100644
index 000000000000..867b37bed45f
--- /dev/null
+++ b/media-plugins/vdr-dvdswitch/files/0.1.3/no-files-crash.diff
@@ -0,0 +1,17 @@
+Index: dvdswitch-0.1.3/menu.c
+===================================================================
+--- dvdswitch-0.1.3.orig/menu.c
++++ dvdswitch-0.1.3/menu.c
+@@ -754,8 +754,10 @@ eOSState cMainMenu::MenuMove(eKeys Key)
+   SetHelp();
+ 
+   mItem = (cMainMenuItem*)Get(Current());
+-  MainMenuOptions.setLastSelectItemName(mItem->FileName());
+-  MainMenuOptions.LastSelectItemType(mItem->Type());
++  if (mItem) {
++    MainMenuOptions.setLastSelectItemName(mItem->FileName());
++    MainMenuOptions.LastSelectItemType(mItem->Type());
++  }
+ 
+   return state;
+ }
diff --git a/media-plugins/vdr-dvdswitch/files/0.1.3/series b/media-plugins/vdr-dvdswitch/files/0.1.3/series
new file mode 100644
index 000000000000..b08c2759a7c9
--- /dev/null
+++ b/media-plugins/vdr-dvdswitch/files/0.1.3/series
@@ -0,0 +1 @@
+no-files-crash.diff
diff --git a/media-plugins/vdr-dvdswitch/files/digest-vdr-dvdswitch-0.1.3-r1 b/media-plugins/vdr-dvdswitch/files/digest-vdr-dvdswitch-0.1.3-r1
new file mode 100644
index 000000000000..b9221976b8d4
--- /dev/null
+++ b/media-plugins/vdr-dvdswitch/files/digest-vdr-dvdswitch-0.1.3-r1
@@ -0,0 +1,3 @@
+MD5 53a98f02806fe014ba2e5a0e41c2b3b6 vdr-dvdswitch-0.1.3.tar.bz2 35924
+RMD160 5bf060b534c07bf44ffccc00d18394381609aeb1 vdr-dvdswitch-0.1.3.tar.bz2 35924
+SHA256 39b04003ea10439ca92b638ca4be13d56b0afb474e72ea3cffdb84355274240b vdr-dvdswitch-0.1.3.tar.bz2 35924
diff --git a/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r1.ebuild b/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r1.ebuild
new file mode 100644
index 000000000000..e0f37a0b33f3
--- /dev/null
+++ b/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-dvdswitch/vdr-dvdswitch-0.1.3-r1.ebuild,v 1.1 2007/05/28 09:06:59 zzam Exp $
+
+inherit vdr-plugin
+
+DESCRIPTION="vdr plugin to play dvds and dvd file structures"
+HOMEPAGE="http://vdrportal.de/board/thread.php?threadid=39984"
+SRC_URI="http://download.schmidtie.de/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 x86"
+IUSE=""
+
+DEPEND=">=media-video/vdr-1.3.21"
+RDEPEND="media-plugins/vdr-dvd
+		>=media-tv/vdr-dvd-scripts-0.0.1-r5"
+
+DEFAULT_IMAGE_DIR="/var/vdr/video/dvd-images"
+
+PATCHES="${FILESDIR}/${PV}/no-files-crash.diff"
+
+src_unpack() {
+	vdr-plugin_src_unpack
+
+	# patching default image-dir to /var/vdr/video/dvd-images
+	sed -e "s:/video/dvd:${DEFAULT_IMAGE_DIR}:" -i setup.c
+}