Mercurial > mplayer.hg

changeset 35967:76d4f38ffdf9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix crash with file selector after pressing OK. The crash would occur with the "dot directory" selected and pressing OK when previously either the "directory up" button or OK (to refresh the file list) has been pressed.
author ib
date Wed, 27 Mar 2013 18:56:13 +0000
parents fab37d38b77c
children 9474726062ef
files gui/dialog/fileselect.c
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gui/dialog/fileselect.c	Mon Mar 25 23:03:07 2013 +0000
+++ b/gui/dialog/fileselect.c	Wed Mar 27 18:56:13 2013 +0000
@@ -372,11 +372,11 @@
  gchar *utf8dir;
 
  chdir( ".." );
- fsSelectedFile=fsThatDir;
  CheckDir( fsFNameList );
  utf8dir = get_current_dir_name_utf8();
  gtk_entry_set_text( GTK_ENTRY( fsPathCombo ),utf8dir );
  g_free(utf8dir);
+ fsSelectedFile=fsThatDir;
  return;
 }
 
@@ -391,12 +391,12 @@
   {
    gchar *utf8dir;
    if ( chdir( fsSelectedFile ) != 0 ) return;
-   fsSelectedFile=fsThatDir;
    CheckDir( fsFNameList );
    utf8dir = get_current_dir_name_utf8();
    gtk_entry_set_text( GTK_ENTRY( fsPathCombo ),utf8dir );
    g_free(utf8dir);
    gtk_widget_grab_focus( fsFNameList );
+   fsSelectedFile=fsThatDir;
    return;
   }