m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

properly keep filename when changing extension in the SAVE file selector

Browse Source 
unicode string was not restored
This commit is contained in:
Thomas Bernard 2018-09-14 20:43:37 +02:00
parent cafa261265
commit 16799113fc
No known key found for this signature in database
GPG Key ID: 0FF11B67A5C0863C
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/filesel.c
View File

@ -1853,18 +1853,17 @@ byte Button_Load_or_Save(T_Selector_settings *settings, byte load, T_IO_Context
{ {
int pos_last_dot; int pos_last_dot;
char* savename = NULL; char* savename = NULL;
word Selector_filename_unicode_save[256];
GFX2_Log(GFX2_DEBUG, "fileselector format changed from %d to %d\n", (int)Selector->Format_filter, (int)Window_attribute2);
Selector->Format_filter = Window_attribute2; Selector->Format_filter = Window_attribute2;
if (Filelist.Nb_elements>0) if (!load)
{ {
T_Fileselector_item * current_item;
current_item = Get_item_by_index(&Filelist, Selector->Position + Selector->Offset);
// In "save" box, if current name is a (possible) filename // In "save" box, if current name is a (possible) filename
// with extension, set it to new format's extension // with extension, set it to new format's extension
if (!load && pos_last_dot = Position_last_dot(Selector_filename);
current_item->Type == 0 && if (Get_fileformat(Selector->Format_filter)->Default_extension[0] != '\0' &&
Get_fileformat(Selector->Format_filter)->Default_extension[0] != '\0' && pos_last_dot!=-1 &&
(pos_last_dot=Position_last_dot(Selector_filename))!=-1 &&
Selector_filename[pos_last_dot+1]!='\0') Selector_filename[pos_last_dot+1]!='\0')
{ {
strcpy(Selector_filename + pos_last_dot + 1, strcpy(Selector_filename + pos_last_dot + 1,
@ -1874,6 +1873,7 @@ byte Button_Load_or_Save(T_Selector_settings *settings, byte load, T_IO_Context
} }
} }
savename = (char *)strdup(Selector_filename); savename = (char *)strdup(Selector_filename);
memcpy(Selector_filename_unicode_save, Selector_filename_unicode, sizeof(Selector_filename_unicode_save));
// By default, position list at the beginning // By default, position list at the beginning
Selector->Position = 0; Selector->Position = 0;
Selector->Offset = 0; Selector->Offset = 0;
@ -1894,7 +1894,10 @@ byte Button_Load_or_Save(T_Selector_settings *settings, byte load, T_IO_Context
// If the file is (still present) or it's a name with new // If the file is (still present) or it's a name with new
// extension, set it as the proposed file name. // extension, set it as the proposed file name.
if (pos!=0 || !load) if (pos!=0 || !load)
{
strcpy(Selector_filename, savename); strcpy(Selector_filename, savename);
memcpy(Selector_filename_unicode, Selector_filename_unicode_save, sizeof(Selector_filename_unicode_save));
}
free(savename); free(savename);
} }
Print_filename_in_fileselector(); Print_filename_in_fileselector();