From 32defb88973737125afd932abf0a4d3cbe5dfb47 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Wed, 4 Mar 2015 10:12:18 +0000 Subject: [PATCH] fix "save as" not showing the current filename * We attempted to set this but it was overwritten when enumerating the files. * This makes it easier to save the file in the same dir, with another name. git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@2111 416bcca6-2ee7-4201-b75f-2eb2f807beb1 --- src/buttons.c | 2 -- src/filesel.c | 8 ++++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/buttons.c b/src/buttons.c index 663c8b54..55f131ec 100644 --- a/src/buttons.c +++ b/src/buttons.c @@ -3466,8 +3466,6 @@ void Save_picture(enum CONTEXT_TYPE type) dotpos = filename + strlen(filename); strcpy(dotpos, ".pal"); - printf("FILEN %s\n", filename); - strcpy(directory, Main_backups->Pages->File_directory); Init_context_layered_image(&save_context, filename, directory); save_context.Type = CONTEXT_PALETTE; diff --git a/src/filesel.c b/src/filesel.c index 9a3e6486..422aa6ec 100644 --- a/src/filesel.c +++ b/src/filesel.c @@ -1500,14 +1500,14 @@ byte Button_Load_or_Save(T_Selector_settings *settings, byte load, T_IO_Context if (!load) { + Highlight_file(Find_file_in_fileselector(&Filelist, context->File_name)); + Prepare_and_display_filelist(Selector->Position,Selector->Offset,file_scroller); + // On initialise le nom de fichier à celui en cours et non pas celui sous // la barre de sélection strcpy(Selector_filename,context->File_name); // On affiche le nouveau nom de fichier Print_filename_in_fileselector(); - - Highlight_file(Find_file_in_fileselector(&Filelist, context->File_name)); - Prepare_and_display_filelist(Selector->Position,Selector->Offset,file_scroller); } New_preview_is_needed=1; @@ -1710,7 +1710,7 @@ byte Button_Load_or_Save(T_Selector_settings *settings, byte load, T_IO_Context free(savename); } Print_filename_in_fileselector(); - Display_cursor(); + Display_cursor(); } break; case 7 : // Saisie d'un commentaire pour la sauvegarde