X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=gtk%2Fsrc%2Fsettings.c;h=f95b6a627fc809120c160a50b1129600ec325021;hb=2ab88e535eeacb45f7d41ecf3eb254e109828409;hp=f392bc281b3bdc9f24ea31bd739f7d007979c17b;hpb=5e7db3ef141be65ee91405a09cfc7356d1373481;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/gtk/src/settings.c b/gtk/src/settings.c
index f392bc28..f95b6a62 100644
--- a/gtk/src/settings.c
+++ b/gtk/src/settings.c
@@ -349,9 +349,13 @@ ghb_widget_value(GtkWidget *widget)
 	}
 	else if (type == GTK_TYPE_FILE_CHOOSER_BUTTON)
 	{
-		const gchar *str;
+		gchar *str;
 		str = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER(widget));
+		if (str == NULL)
+			str = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(widget));
 		value = ghb_string_value_new(str);
+		if (str != NULL)
+			g_free(str);
 	}
 	else
 	{
@@ -620,10 +624,27 @@ update_widget(GtkWidget *widget, const GValue *value)
 		{
 			gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(widget), str);
 		}
-		else
+		else if (act == GTK_FILE_CHOOSER_ACTION_SAVE)
 		{
 			gtk_file_chooser_set_filename (GTK_FILE_CHOOSER(widget), str);
 		}
+		else
+		{
+			if (!g_file_test(str, G_FILE_TEST_IS_DIR))
+			{
+				gchar *dirname;
+
+				dirname = g_path_get_dirname(str);
+				gtk_file_chooser_set_current_folder(
+					GTK_FILE_CHOOSER(widget), dirname);
+				g_free(dirname);
+			}
+			else
+			{
+				gtk_file_chooser_set_current_folder(
+					GTK_FILE_CHOOSER(widget), str);
+			}
+		}
 	}
 	else
 	{