brasero r1063 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Sat Aug  9 12:37:19 2008
New Revision: 1063
URL: http://svn.gnome.org/viewvc/brasero?rev=1063&view=rev

Log:
	Fix #543715 â Burn image not possible

	* src/burn-caps.c (brasero_caps_disc_new_status):


Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/src/burn-caps.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Sat Aug  9 12:37:19 2008
@@ -7,6 +7,7 @@
 
 Bug fixed:
 
+#543715 â Burn image not possible
 #543377 â No multisession
 #537871 â Burn speed selection does not work
 #545138 â brasero 0.8 ftbfs on alpha

Modified: trunk/src/burn-caps.c
==============================================================================
--- trunk/src/burn-caps.c	(original)
+++ trunk/src/burn-caps.c	Sat Aug  9 12:37:19 2008
@@ -3115,7 +3115,7 @@
 	caps->flags = BRASERO_PLUGIN_IO_ACCEPT_FILE;
 	caps->type.type = BRASERO_TRACK_TYPE_DISC;
 	caps->type.subtype.media = media;
-	
+
 	BRASERO_BURN_LOG_WITH_TYPE (&caps->type,
 				    caps->flags,
 				    "Created");
@@ -3132,17 +3132,18 @@
 	if ((type & BRASERO_MEDIUM_BLANK)
 	&& !(media & BRASERO_MEDIUM_ROM)) {
 		/* if media is blank there is no other possible property */
-		if (BRASERO_MEDIUM_IS (type, BRASERO_MEDIUM_DVDRW_PLUS)
-		||  BRASERO_MEDIUM_IS (type, BRASERO_MEDIUM_DVDRW_RESTRICTED)
-		||  BRASERO_MEDIUM_IS (type, BRASERO_MEDIUM_DVDRW_PLUS_DL)) {
+		if (BRASERO_MEDIUM_IS (media, BRASERO_MEDIUM_DVDRW_PLUS)
+		||  BRASERO_MEDIUM_IS (media, BRASERO_MEDIUM_DVDRW_RESTRICTED)
+		||  BRASERO_MEDIUM_IS (media, BRASERO_MEDIUM_DVDRW_PLUS_DL)) {
 			/* This is only for above types */
 			retval = brasero_caps_disc_lookup_or_create (retval,
 								     media|
 								     BRASERO_MEDIUM_BLANK);
-			retval = brasero_caps_disc_lookup_or_create (retval,
-								     media|
-								     BRASERO_MEDIUM_BLANK|
-								     (type & BRASERO_MEDIUM_UNFORMATTED));
+			if (type & BRASERO_MEDIUM_UNFORMATTED)
+				retval = brasero_caps_disc_lookup_or_create (retval,
+									     media|
+									     BRASERO_MEDIUM_BLANK|
+									     BRASERO_MEDIUM_UNFORMATTED);
 		}
 		else
 			retval = brasero_caps_disc_lookup_or_create (retval,