From: jstebbins <jstebbins.hb@gmail.com>
Date: Sat, 6 Sep 2008 19:13:25 +0000 (+0000)
Subject: LinGui: Fix a non-fatal Gtk assert when switching the source selection mode
X-Git-Tag: 0.9.3~273
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=74961ccaa30bdf49516c89755e4b2a34e87c18fc;p=handbrake

LinGui: Fix a non-fatal Gtk assert when switching the source selection mode
from file to folder.


git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1671 b64f7644-9d1e-0410-96f1-a4d463321fa5
---

diff --git a/gtk/src/callbacks.c b/gtk/src/callbacks.c
index bd07e34b2..36013fa23 100644
--- a/gtk/src/callbacks.c
+++ b/gtk/src/callbacks.c
@@ -466,36 +466,29 @@ dvd_device_changed_cb(GtkComboBox *combo, GtkWidget *dialog)
 	}
 }
 
-
 void
 source_type_changed_cb(GtkToggleButton *toggle, GtkFileChooser *chooser)
 {
-	gchar *filename;
+	gchar *folder;
 	
 	g_debug("source_type_changed_cb ()");
+	folder = gtk_file_chooser_get_current_folder (chooser);
 	if (gtk_toggle_button_get_active (toggle))
 	{
-		filename = gtk_file_chooser_get_filename (chooser);
 		gtk_file_chooser_set_action (chooser, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
-		if (filename != NULL)
-		{
-			gtk_file_chooser_set_filename(chooser, filename);
-			g_free(filename);
-		}
 		gtk_widget_set_sensitive (dvd_device_combo, FALSE);
 		gtk_combo_box_set_active (GTK_COMBO_BOX(dvd_device_combo), 0);
 	}
 	else
 	{
-		filename = gtk_file_chooser_get_filename (chooser);
 		gtk_file_chooser_set_action (chooser, GTK_FILE_CHOOSER_ACTION_OPEN);
-		if (filename != NULL)
-		{
-			gtk_file_chooser_set_filename(chooser, filename);
-			g_free(filename);
-		}
 		gtk_widget_set_sensitive (dvd_device_combo, TRUE);
 	}
+	if (folder != NULL)
+	{
+		gtk_file_chooser_set_current_folder(chooser, folder);
+		g_free(folder);
+	}
 }
 
 static GtkWidget*