Mercurial > mplayer.hg
comparison gui/dialog/fileselect.c @ 35964:3ebf8c880e07
Don't set path information for fsVideoSelector on ShowFileSelect().
This avoids adding the path of the first playlist item to the history.
The path of a selected file has already been added to the history on
file selection, so this information won't get lost.
author | ib |
---|---|
date | Mon, 25 Mar 2013 00:46:12 +0000 |
parents | 373c1104023f |
children | 76d4f38ffdf9 |
comparison
equal
deleted
inserted
replaced
35963:db72a3183d41 | 35964:3ebf8c880e07 |
---|---|
664 fsList_items=g_list_append( fsList_items,fsVideoFilterNames[i][0] ); | 664 fsList_items=g_list_append( fsList_items,fsVideoFilterNames[i][0] ); |
665 k = fsLastVideoFilterSelected; | 665 k = fsLastVideoFilterSelected; |
666 gtk_combo_set_popdown_strings( GTK_COMBO( List ),fsList_items ); | 666 gtk_combo_set_popdown_strings( GTK_COMBO( List ),fsList_items ); |
667 g_list_free( fsList_items ); | 667 g_list_free( fsList_items ); |
668 gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsVideoFilterNames[k >= 0 ? k : i-2][0] ); | 668 gtk_entry_set_text( GTK_ENTRY( fsFilterCombo ),fsVideoFilterNames[k >= 0 ? k : i-2][0] ); |
669 tmp=guiInfo.Filename; | 669 //tmp=guiInfo.Filename; |
670 break; | 670 break; |
671 case fsSubtitleSelector: | 671 case fsSubtitleSelector: |
672 gtk_window_set_title( GTK_WINDOW( fsFileSelect ),MSGTR_SubtitleSelect ); | 672 gtk_window_set_title( GTK_WINDOW( fsFileSelect ),MSGTR_SubtitleSelect ); |
673 fsList_items=NULL; | 673 fsList_items=NULL; |
674 for( i=0;fsSubtitleFilterNames[i][0];i++ ) | 674 for( i=0;fsSubtitleFilterNames[i][0];i++ ) |
713 break; | 713 break; |
714 } | 714 } |
715 | 715 |
716 fsMedium=(fsType == fsVideoSelector || fsType == fsSubtitleSelector || fsType == fsAudioSelector); | 716 fsMedium=(fsType == fsVideoSelector || fsType == fsSubtitleSelector || fsType == fsAudioSelector); |
717 | 717 |
718 if ( !tmp && fsMedium ) tmp=guiInfo.Filename; | |
719 | |
720 if ( tmp && tmp[0] && !strstr( tmp,"://" ) ) | 718 if ( tmp && tmp[0] && !strstr( tmp,"://" ) ) |
721 { | 719 { |
722 dir = strdup( tmp ); | 720 dir = strdup( tmp ); |
723 | 721 |
724 do | 722 do |