brasero r1223 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Sun Aug 31 13:09:47 2008
New Revision: 1223
URL: http://svn.gnome.org/viewvc/brasero?rev=1223&view=rev

Log:
	Avoid crashing when reloading a media that isn\'t supported in copy

	* src/burn.c (brasero_burn_lock_dest_media),
	(brasero_burn_reload_dest_media):


Modified:
   trunk/ChangeLog
   trunk/src/burn.c

Modified: trunk/src/burn.c
==============================================================================
--- trunk/src/burn.c	(original)
+++ trunk/src/burn.c	Sun Aug 31 13:09:47 2008
@@ -926,7 +926,7 @@
 			goto again;
 	}
 
-	if (result != BRASERO_BURN_OK) {
+	if (result != BRASERO_BURN_OK && priv->dest_locked) {
 		priv->dest_locked = 0;
 		brasero_drive_unlock (priv->dest);
 	}
@@ -947,7 +947,10 @@
 
 	/* eject and ask the user to reload a disc */
 	required_media = brasero_burn_caps_get_required_media_type (priv->caps, priv->session);
-	required_media &= (BRASERO_MEDIUM_WRITABLE|BRASERO_MEDIUM_CD|BRASERO_MEDIUM_DVD|BRASERO_MEDIUM_DVD_DL);
+	required_media &= (BRASERO_MEDIUM_WRITABLE|
+			   BRASERO_MEDIUM_CD|
+			   BRASERO_MEDIUM_DVD|
+			   BRASERO_MEDIUM_DVD_DL);
 
 	result = brasero_burn_ask_for_dest_media (burn,
 						  error_code,