summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-11-09 20:12:20 +0000
committerSND\edgbla_cp <SND\edgbla_cp@e17a0e51-4ae3-4d35-97c3-1a29b211df97>2010-11-09 20:12:20 +0000
commitb283bc85aa97df7f1ddbdf3a63a59e6027b2d850 (patch)
tree1ad84a11b126e984a2c4fdb46f8a6a7ad7cf6ef4
parent676d06ab46f70c7ad5f83c819c0b240e99f7c9ec (diff)
downloadpcsxr-b283bc85aa97df7f1ddbdf3a63a59e6027b2d850.tar.gz
Patch 7328 (gschwind).
git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@59363 e17a0e51-4ae3-4d35-97c3-1a29b211df97
-rw-r--r--gui/Gtk2Gui.c17
1 files changed, 16 insertions, 1 deletions
diff --git a/gui/Gtk2Gui.c b/gui/Gtk2Gui.c
index 9e8f472f..674d1ba4 100644
--- a/gui/Gtk2Gui.c
+++ b/gui/Gtk2Gui.c
@@ -589,10 +589,25 @@ static gchar *Open_Iso_Proc() {
gchar *path = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(chooser));
strcpy(current_folder, path);
g_free(path);
- filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER (chooser));
+ GSList * l = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER (chooser));
+ if(l) {
+ filename = l->data;
+ /* free useless data */
+ GSList * ll = l;
+ while(l->next) {
+ l = l->next;
+ g_free(l->data);
+ }
+ g_slist_free(ll);
+
gtk_widget_destroy(GTK_WIDGET(chooser));
while (gtk_events_pending()) gtk_main_iteration();
return filename;
+ } else {
+ gtk_widget_destroy (GTK_WIDGET(chooser));
+ while (gtk_events_pending()) gtk_main_iteration();
+ return NULL;
+ }
} else {
gtk_widget_destroy (GTK_WIDGET(chooser));
while (gtk_events_pending()) gtk_main_iteration();