mirror/aseprite
1
0
Fork 0
mirror of https://github.com/aseprite/aseprite.git synced 2025-02-06 21:39:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bug in the File Open dialog when user presses ENTER key with an empty file name.

Browse Source
This commit is contained in:
David Capello 2009-03-02 02:08:40 +00:00
parent 4bf54b3712
commit cb6b45bb3f
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2009-03-02 David A. Capello <davidcapello@gmail.com>
* src/dialogs/filesel.cpp (ase_file_selector): Fixed a bug
when the user presses ENTER with an empty file name.
2009-03-01 David A. Capello <davidcapello@gmail.com> 2009-03-01 David A. Capello <davidcapello@gmail.com>
* src/widgets/editor/cursor.cpp (editor_clean_cursor): Fixed a * src/widgets/editor/cursor.cpp (editor_clean_cursor): Fixed a

2
NEWS.txt
View File

@ -8,6 +8,8 @@ NEWS
+ Added "Save Copy As" command (feature #2636076). + Added "Save Copy As" command (feature #2636076).
+ Fixed compilation support for gcc 64 bits. + Fixed compilation support for gcc 64 bits.
+ Fixed a bug with multiple editors and paste command. + Fixed a bug with multiple editors and paste command.
+ Fixed a bug in the File Open dialog when user presses ENTER key
with an empty file name.
0.6.1 0.6.1
----- -----

12
src/dialogs/filesel.cpp
View File

@ -239,10 +239,14 @@ again:
if (!enter_folder) if (!enter_folder)
enter_folder = folder; enter_folder = folder;
} }
else { else if (!fn.empty()) {
// check if the user specified in "fn" a item of "fileview" // check if the user specified in "fn" a item of "fileview"
const FileItemList& children = fileview_get_filelist(fileview); const FileItemList& children = fileview_get_filelist(fileview);
#ifdef ALLEGRO_WINDOWS
fn.tolower();
#endif
for (FileItemList::const_iterator for (FileItemList::const_iterator
it=children.begin(); it!=children.end(); ++it) { it=children.begin(); it!=children.end(); ++it) {
FileItem* child = *it; FileItem* child = *it;
@ -250,7 +254,6 @@ again:
#ifdef ALLEGRO_WINDOWS #ifdef ALLEGRO_WINDOWS
child_name.tolower(); child_name.tolower();
fn.tolower();
#endif #endif
if (child_name == fn) { if (child_name == fn) {
enter_folder = *it; enter_folder = *it;
@ -297,6 +300,11 @@ again:
enter_folder = get_fileitem_from_path(buf); enter_folder = get_fileitem_from_path(buf);
} }
} }
else {
// show the window again
jwidget_show(window);
goto again;
}
// did we find a folder to enter? // did we find a folder to enter?
if (enter_folder && if (enter_folder &&