r14715 - in packages/trunk/yabause/debian: . patches

[Evgeni Golov]

Author: evgeni
Date: 2013-12-23 14:48:06 +0000 (Mon, 23 Dec 2013)
New Revision: 14715

Added:
   packages/trunk/yabause/debian/patches/
   packages/trunk/yabause/debian/patches/fix_assert_on_machines_without_cdrom.patch
   packages/trunk/yabause/debian/patches/series
Modified:
   packages/trunk/yabause/debian/changelog
Log:
Do not crash settings, if there is no optical drive in the system.


Modified: packages/trunk/yabause/debian/changelog
===================================================================
--- packages/trunk/yabause/debian/changelog	2013-12-22 17:46:16 UTC (rev 14714)
+++ packages/trunk/yabause/debian/changelog	2013-12-23 14:48:06 UTC (rev 14715)
@@ -1,3 +1,11 @@
+yabause (0.9.13-2) UNRELEASED; urgency=medium
+
+  * Do not crash settings, if there is no optical drive in the system.
+    Patch imported from upstream.
+    Closes: #732804
+
+ -- Evgeni Golov <evgeni at debian.org>  Mon, 23 Dec 2013 15:36:38 +0100
+
 yabause (0.9.13-1) unstable; urgency=low
 
   * New upstream release.

Added: packages/trunk/yabause/debian/patches/fix_assert_on_machines_without_cdrom.patch
===================================================================
--- packages/trunk/yabause/debian/patches/fix_assert_on_machines_without_cdrom.patch	                        (rev 0)
+++ packages/trunk/yabause/debian/patches/fix_assert_on_machines_without_cdrom.patch	2013-12-23 14:48:06 UTC (rev 14715)
@@ -0,0 +1,43 @@
+From f52983f9d257e1f16bb480535d8020cdc790fb4d Mon Sep 17 00:00:00 2001
+From: yabause <yabause at d7be59e3-070e-4b9a-85a1-4646befae34d>
+Date: Mon, 23 Dec 2013 10:10:24 +0000
+Subject: [PATCH] Fixed a bug on machines without optical drive
+
+This fix http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=732804
+
+git-svn-id: svn+ssh://svn.code.sf.net/p/yabause/code/trunk@3224 d7be59e3-070e-4b9a-85a1-4646befae34d
+---
+ yabause/src/qt/ui/UISettings.cpp | 16 ++++++++--------
+ 1 file changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/yabause/src/qt/ui/UISettings.cpp b/yabause/src/qt/ui/UISettings.cpp
+index 504e86a..de7f932 100755
+--- yabause/src/qt/ui/UISettings.cpp
++++ yabause/src/qt/ui/UISettings.cpp
+@@ -168,15 +168,15 @@ QStringList getCdDriveList()
+ 	char drive_name[10];
+ 	char drive_path[255];
+ 
+-	Q_ASSERT( f );
+-
+-	while (fgets(buffer, 1024, f) != NULL) {
+-		if (sscanf(buffer, "drive name:%s", drive_name) == 1) {
+-			sprintf(drive_path, "/dev/%s", drive_name);
+-
+-			list.append(drive_path);
++	if (f != NULL) {
++		while (fgets(buffer, 1024, f) != NULL) {
++			if (sscanf(buffer, "drive name:%s", drive_name) == 1) {
++				sprintf(drive_path, "/dev/%s", drive_name);
++
++				list.append(drive_path);
++			}
+ 		}
+-	}
++	}
+ #elif defined Q_OS_MAC
+ #endif
+ 	return list;
+-- 
+1.8.5.1
+

Added: packages/trunk/yabause/debian/patches/series
===================================================================
--- packages/trunk/yabause/debian/patches/series	                        (rev 0)
+++ packages/trunk/yabause/debian/patches/series	2013-12-23 14:48:06 UTC (rev 14715)
@@ -0,0 +1 @@
+fix_assert_on_machines_without_cdrom.patch