summaryrefslogtreecommitdiffstats
path: root/docs/release/src/osd/winui/treeview.cpp
diff options
context:
space:
mode:
author Robbbert <Robbbert@users.noreply.github.com>2022-05-25 12:04:43 +1000
committer Robbbert <Robbbert@users.noreply.github.com>2022-05-25 12:04:43 +1000
commitbb3b24ebe57f00f88d4c4d0fa540f2a913b87625 (patch)
treef14e67ab60e09a5f7ca141d4fbfbf10346e8b87d /docs/release/src/osd/winui/treeview.cpp
parenta196fb975c8343dc5b09a4debc2fcb4da702411e (diff)
***** Some files for 0.244tag244
Diffstat (limited to 'docs/release/src/osd/winui/treeview.cpp')
-rw-r--r--docs/release/src/osd/winui/treeview.cpp24
1 files changed, 15 insertions, 9 deletions
diff --git a/docs/release/src/osd/winui/treeview.cpp b/docs/release/src/osd/winui/treeview.cpp
index c28ede76e1d..c0860dd11cf 100644
--- a/docs/release/src/osd/winui/treeview.cpp
+++ b/docs/release/src/osd/winui/treeview.cpp
@@ -1556,11 +1556,14 @@ void SelectTreeViewFolder(int folder_id)
tvi.mask = TVIF_PARAM;
res = TreeView_GetItem(hTreeView,&tvi);
- if (((LPTREEFOLDER)tvi.lParam)->m_nFolderId == folder_id)
+ if (tvi.lParam)
{
- res = TreeView_SelectItem(hTreeView,tvi.hItem);
- SetCurrentFolder((LPTREEFOLDER)tvi.lParam);
- return;
+ if (((LPTREEFOLDER)tvi.lParam)->m_nFolderId == folder_id)
+ {
+ res = TreeView_SelectItem(hTreeView,tvi.hItem);
+ SetCurrentFolder((LPTREEFOLDER)tvi.lParam);
+ return;
+ }
}
hti_next = TreeView_GetChild(hTreeView,hti);
@@ -2020,7 +2023,7 @@ static int InitExtraFolders(void)
/* NPW 9-Feb-2003 - MSVC stat() doesn't like stat() called with an empty string */
if (!dir)
- dir = ".";
+ return 0; //dir = ".";
// Why create the directory if it doesn't exist, just return 0 folders.
if (stat(dir, &stat_buffer) != 0)
@@ -2030,14 +2033,16 @@ static int InitExtraFolders(void)
chdir(dir);
- long hLong = _findfirst("*", &files);
-
for (i = 0; i < MAX_EXTRA_FOLDERS; i++)
ExtraFolderIcons[i] = NULL;
numExtraIcons = 0;
+ intptr_t hLong = 0L;
- while (!_findnext(hLong, &files))
+ if ( (hLong = _findfirst("*.ini", &files)) == -1L )
+ return 0;
+
+ do
{
if ((files.attrib & _A_SUBDIR) == 0)
{
@@ -2112,9 +2117,10 @@ static int InitExtraFolders(void)
}
}
}
- }
+ } while( _findnext(hLong, &files) == 0);
chdir(curdir);
+ _findclose(hLong);
return count;
}