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

Restore the Selector_filename in case of Bookmark error.

Browse Source 
There was a small bug in the code. To reproduce :
1- select a file to preview
2- Select a boggus bookmark, get the RED flash => OK
3- Click Load. RED Flash instead of loading the selected file

now the "selected file" (Selector_filename) is properly restored
This commit is contained in:
Thomas Bernard 2018-01-21 20:17:17 +01:00
parent aeca7af074
commit 350ca22f1e
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/filesel.c
View File

@ -1889,7 +1889,11 @@ byte Button_Load_or_Save(T_Selector_settings *settings, byte load, T_IO_Context
case -1: // bouton lui-même: aller au répertoire mémorisé case -1: // bouton lui-même: aller au répertoire mémorisé
if (Config.Bookmark_directory[clicked_button-10]) if (Config.Bookmark_directory[clicked_button-10])
{ {
strcpy(Selector_filename,Config.Bookmark_directory[clicked_button-10]); // backup the currently selected filename
strncpy(save_filename, Selector_filename, sizeof(save_filename));
// simulate a click on the bookmarked directory
strncpy(Selector_filename,Config.Bookmark_directory[clicked_button-10], sizeof(Selector_filename));
Selector_filename[sizeof(Selector_filename)-1] = '\0';
Selected_type=1; Selected_type=1;
has_clicked_ok=1; has_clicked_ok=1;
Reset_quicksearch(); Reset_quicksearch();
@ -2101,7 +2105,12 @@ byte Button_Load_or_Save(T_Selector_settings *settings, byte load, T_IO_Context
} }
else else
{ {
char warn_msg[MAX_PATH_CHARACTERS];
Display_cursor(); Display_cursor();
snprintf(warn_msg, sizeof(warn_msg), "cannot chdir to \"%s\" !", Selector_filename);
Warning(warn_msg);
// restore Selector_filename
strncpy(Selector_filename, save_filename, sizeof(Selector_filename));
Error(0); Error(0);
} }
} }