[brasero: 12/18] Fix problem with project loading

[Philippe Rouquier <philippr src gnome org>]

commit 218b06559ee301313e7f92efa79d1c65af3fb1dd
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Sun May 3 14:02:02 2009 +0200

    Fix problem with project loading
    Fix problem where among several BraseroTrackStream, only one was burnt
---
 libbrasero-burn/brasero-session.c |    7 +------
 src/brasero-data-disc.c           |    6 ++++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/libbrasero-burn/brasero-session.c b/libbrasero-burn/brasero-session.c
index 8771aa7..2f9f672 100644
--- a/libbrasero-burn/brasero-session.c
+++ b/libbrasero-burn/brasero-session.c
@@ -223,7 +223,6 @@ brasero_burn_session_add_track (BraseroBurnSession *self,
 				BraseroTrack *new_track)
 {
 	BraseroBurnSessionPrivate *priv;
-	BraseroTrackType *type;
 
 	g_return_val_if_fail (BRASERO_IS_BURN_SESSION (self), BRASERO_BURN_ERR);
 
@@ -254,10 +253,7 @@ brasero_burn_session_add_track (BraseroBurnSession *self,
 
 	/* if there is already a track, then we replace it on condition that it
 	 * has the same type and it's not AUDIO (only one allowed to have many) */
-	type = brasero_track_type_new ();
-	brasero_burn_session_get_input_type (self, type);
-	if (!BRASERO_IS_TRACK_STREAM (new_track)
-	||  brasero_track_type_get_has_stream (type)) {
+	if (!BRASERO_IS_TRACK_STREAM (new_track)) {
 		brasero_burn_session_stop_tracks_monitoring (self);
 
 		g_slist_foreach (priv->tracks, (GFunc) g_object_unref, NULL);
@@ -275,7 +271,6 @@ brasero_burn_session_add_track (BraseroBurnSession *self,
 		priv->tracks = g_slist_append (priv->tracks, new_track);
 	}
 
-	brasero_track_type_free (type);
 	return BRASERO_BURN_OK;
 }
 
diff --git a/src/brasero-data-disc.c b/src/brasero-data-disc.c
index 5a2f5a1..a86b113 100644
--- a/src/brasero-data-disc.c
+++ b/src/brasero-data-disc.c
@@ -549,6 +549,9 @@ brasero_data_disc_project_oversized_cb (BraseroTrackDataCfg *project,
 
 	priv = BRASERO_DATA_DISC_PRIVATE (self);
 
+	if (!priv->message)
+		return;
+
 	if (overburn) {
 		if (priv->overburning)
 			return;
@@ -1412,10 +1415,9 @@ brasero_data_disc_load_track (BraseroDisc *disc,
 		return BRASERO_DISC_OK;
 	}
 
-	if (res == BRASERO_BURN_NOT_READY)
+	if (res != BRASERO_BURN_NOT_READY)
 		return BRASERO_DISC_ERROR_UNKNOWN;
 
-
 	status = brasero_status_new ();
 	brasero_track_get_status (BRASERO_TRACK (priv->project), status);