brasero r806 - in trunk: . src

[philippr svn gnome org]

Author: philippr
Date: Fri May  9 13:36:47 2008
New Revision: 806
URL: http://svn.gnome.org/viewvc/brasero?rev=806&view=rev

Log:
	Fix crash when a file don\'t replace an imported one (when the user refuses to)

	* src/brasero-data-session.c (brasero_data_session_add_last):

Modified:
   trunk/ChangeLog
   trunk/src/brasero-data-session.c

Modified: trunk/src/brasero-data-session.c
==============================================================================
--- trunk/src/brasero-data-session.c	(original)
+++ trunk/src/brasero-data-session.c	Fri May  9 13:36:47 2008
@@ -174,15 +174,15 @@
 								       file,
 								       NULL);
 
+		if (!node)
+			continue;
+
 		if (!node->is_file)
 			brasero_data_session_add_children_files (self,
 								 node,
 								 file->specific.dir.children);
 
 		priv->nodes = g_slist_prepend (priv->nodes, node);
-
-		/* FIXME: it could be good to check if a directory with the 
-		 * same filename doesn't exist and "merge" them */
 	}
 
 	/* put this here in case we have to replace one file at the root