chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

Fixed issue in 5e4b65e

Browse Source
This commit is contained in:
Birunthan Mohanathas 2012-06-01 13:47:35 +03:00
parent 5e4b65ebd2
commit 042bc5a22f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/Rainmeter.cpp
View File

@ -1628,6 +1628,7 @@ int CRainmeter::ScanForConfigsRecursive(const std::wstring& path, std::wstring b
NULL, NULL,
0); 0);
bool foundFiles = false;
if (hSearch != INVALID_HANDLE_VALUE) if (hSearch != INVALID_HANDLE_VALUE)
{ {
SkinFolder folder; SkinFolder folder;
@ -1635,7 +1636,6 @@ int CRainmeter::ScanForConfigsRecursive(const std::wstring& path, std::wstring b
folder.active = 0; folder.active = 0;
folder.level = level; folder.level = level;
bool foundFiles = false;
do do
{ {
const std::wstring filename = fileData.cFileName; const std::wstring filename = fileData.cFileName;
@ -1689,7 +1689,7 @@ int CRainmeter::ScanForConfigsRecursive(const std::wstring& path, std::wstring b
if (!subfolders.empty()) if (!subfolders.empty())
{ {
bool emptyFolders = true; bool popFolder = !foundFiles;
std::list<std::wstring>::const_iterator iter = subfolders.begin(); std::list<std::wstring>::const_iterator iter = subfolders.begin();
for ( ; iter != subfolders.end(); ++iter) for ( ; iter != subfolders.end(); ++iter)
@ -1697,13 +1697,13 @@ int CRainmeter::ScanForConfigsRecursive(const std::wstring& path, std::wstring b
int newIndex = ScanForConfigsRecursive(path, base + (*iter), index, level + 1); int newIndex = ScanForConfigsRecursive(path, base + (*iter), index, level + 1);
if (newIndex != index) if (newIndex != index)
{ {
emptyFolders = false; popFolder = false;
} }
index = newIndex; index = newIndex;
} }
if (emptyFolders) if (popFolder)
{ {
m_SkinFolders.pop_back(); m_SkinFolders.pop_back();
} }