ecere/gui/dialogs/FileDialog: Select Folder fixes following 'Select Here' changes

[sdk] / ecere / src / gui / dialogs / FileDialog.ec

diff --git a/ecere/src/gui/dialogs/FileDialog.ec b/ecere/src/gui/dialogs/FileDialog.ec
index 7cab779..b009d01 100644 (file)
--- a/ecere/src/gui/dialogs/FileDialog.ec
+++ b/ecere/src/gui/dialogs/FileDialog.ec
@@ -613,6 +613,9 @@ private:
             ok.caption = $"Select Here";
             ok.isDefault = true;
             open.isDefault = false;
+
+            // Never use contents of editbox for 'Select Here'
+            getNameFromListBox = true;
          }
          else
          {
@@ -807,7 +810,7 @@ private:
    {
       bool result = true;
       FileAttribs exists = 0;
-      char * wildcardPointer = strstr(fileName, "*");
+      char * wildcardPointer = fileName ? strstr(fileName, "*") : null;
 
       if(wildcardPointer)
       {
@@ -1057,7 +1060,7 @@ private:
       else
       {
          strcpy(filePath, currentDirectory);
-         if(PathCat(filePath, fileName) || style == selectDir)
+         if((style == selectDir && !fileName) || PathCat(filePath, fileName) || style == selectDir)
          {
             FileFixCase(filePath);
             exists = FileExists(filePath);