[brasero] Fix #591397 - Brasero Main window pops up after exiting from Image Burning window.

[Philippe Rouquier <philippr src gnome org>]

commit aceb1aabf9ff25cee3b152697d4aab093c0a2421
Author: Philippe Rouquier <bonfire-app wanadoo fr>
Date:   Wed Aug 26 14:03:50 2009 +0200

    Fix #591397 -  Brasero Main window pops up after exiting from Image Burning window.

 src/brasero-app.c |   10 ++++++++--
 src/main.c        |   14 +++++---------
 2 files changed, 13 insertions(+), 11 deletions(-)
---
diff --git a/src/brasero-app.c b/src/brasero-app.c
index d8de171..e7b3e99 100644
--- a/src/brasero-app.c
+++ b/src/brasero-app.c
@@ -1155,14 +1155,17 @@ brasero_app_open_by_mime (BraseroApp *app,
 	     ||  !strcmp (mime, "audio/x-mpegurl"))
 		return (brasero_project_manager_open_project (BRASERO_PROJECT_MANAGER (priv->projects), uri, TRUE, FALSE) != BRASERO_PROJECT_TYPE_INVALID);
 
-
 #endif
 
 	else if (!strcmp (mime, "application/x-cd-image")
 	     ||  !strcmp (mime, "application/x-cdrdao-toc")
 	     ||  !strcmp (mime, "application/x-toc")
 	     ||  !strcmp (mime, "application/x-cue")) {
-		brasero_project_manager_iso (BRASERO_PROJECT_MANAGER (priv->projects), uri);
+		if (priv->projects)
+			brasero_project_manager_iso (BRASERO_PROJECT_MANAGER (priv->projects), uri);
+		else
+			brasero_app_burn_image (app, uri);
+
 		return TRUE;
 	}
 
@@ -1468,6 +1471,9 @@ brasero_app_create_mainwin (BraseroApp *app)
 
 	priv = BRASERO_APP_PRIVATE (app);
 
+	if (priv->mainwin)
+		return;
+
 	/* New window */
 	priv->mainwin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
 	gtk_window_set_icon_name (GTK_WINDOW (priv->mainwin), "brasero");
diff --git a/src/main.c b/src/main.c
index 66d0a24..c4f125c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -430,17 +430,13 @@ brasero_app_parse_options (BraseroApp *app)
 		return;
 	}
 	else if (files) {
+		if (g_strv_length (files) == 1
+		&&  brasero_app_open_uri (app, files [0]))
+			return;
+
 		brasero_app_create_mainwin (app);
 		manager = brasero_app_get_project_manager (app);
-
-		if (g_strv_length (files) == 1) {
-			/* Fallback if it hasn't got a suitable URI */
-			if (!brasero_app_open_uri (app, files [0])) {
-				BRASERO_PROJECT_OPEN_LIST (manager, brasero_project_manager_data, files, FALSE);
-			}
-		}
-		else
-			BRASERO_PROJECT_OPEN_LIST (manager, brasero_project_manager_data, files, FALSE);
+		BRASERO_PROJECT_OPEN_LIST (manager, brasero_project_manager_data, files, FALSE);
 	}
 	else {
 		brasero_app_create_mainwin (app);