[kdemultimedia/f16] Do not crash on startup if no CD is in the drive

[Than Ngo]

commit 6bead09e5d096c12821038076c381b4e1d832af6
Author: Than Ngo <than at redhat.com>
Date:   Mon Dec 19 10:34:14 2011 +0100

    Do not crash on startup if no CD is in the drive

 kdemultimedia-4.7.4-kscd.patch |   15 +++++++++++++++
 kdemultimedia.spec             |    9 ++++++++-
 2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/kdemultimedia-4.7.4-kscd.patch b/kdemultimedia-4.7.4-kscd.patch
new file mode 100644
index 0000000..034b377
--- /dev/null
+++ b/kdemultimedia-4.7.4-kscd.patch
@@ -0,0 +1,15 @@
+diff -up kdemultimedia-4.7.4/kscd/kscd.cpp.orig kdemultimedia-4.7.4/kscd/kscd.cpp
+--- kdemultimedia-4.7.4/kscd/kscd.cpp.orig	2011-12-19 10:16:31.077934542 +0100
++++ kdemultimedia-4.7.4/kscd/kscd.cpp	2011-12-19 10:17:25.202248897 +0100
+@@ -69,7 +69,10 @@ KSCD::KSCD( QWidget *parent ) : KscdWind
+ 
+ 	/** Music Brainz initialisation	*/
+ 	m_MBManager = new MBManager();
+-	m_MBManager->discLookup(devices->getMedia()->currentSource().deviceName());
++	if (devices->getMedia())
++	{
++		m_MBManager->discLookup(devices->getMedia()->currentSource().deviceName());
++	}
+ 
+ 	setupActions();
+ 	setupContextMenu();
diff --git a/kdemultimedia.spec b/kdemultimedia.spec
index 7e7941f..eb3307f 100644
--- a/kdemultimedia.spec
+++ b/kdemultimedia.spec
@@ -6,7 +6,7 @@
 Name:    kdemultimedia
 Epoch:   6
 Version: 4.7.4
-Release: 1%{?dist}
+Release: 2%{?dist}
 Summary: KDE Multimedia applications
 
 Group:   Applications/Multimedia
@@ -23,6 +23,8 @@ Patch1: kdemultimedia-4.6.2-no_thumbs.patch
 # https://svn.reviewboard.kde.org/r/6794/
 # will be in 4.8
 Patch100: kdemultimedia-4.7.1-dragonplayer-phonon-dvd-menu.patch
+# Do not crash on startup if no CD is in the drive
+Patch101: kdemultimedia-4.7.4-kscd.patch
 
 BuildRequires: cdparanoia-devel cdparanoia
 BuildRequires: kdepimlibs-devel >= %{version}
@@ -142,6 +144,8 @@ pushd dragonplayer
 %patch100 -p0 -b .dvd-menus
 popd
 
+%patch101 -p1 -b .crash
+
 %build
 
 mkdir -p %{_target_platform}
@@ -331,6 +335,9 @@ fi
 
 
 %changelog
+* Mon Dec 19 2011 Than Ngo <than at redhat.com> - 6:4.7.4-2
+- Do not crash on startup if no CD is in the drive
+
 * Fri Dec 02 2011 Rex Dieter <rdieter at fedoraproject.org> - 6:4.7.4-1
 - 4.7.4