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

Minor tweaks.

Browse Source
This commit is contained in:
spx 2011-11-19 23:09:41 +00:00
parent 5d20dcbddd
commit 4719e4a600
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Library/Rainmeter.cpp
View File

@ -1481,10 +1481,11 @@ void CRainmeter::SetLoadOrder(int configIndex, int order)
int CRainmeter::GetLoadOrder(const std::wstring& config) int CRainmeter::GetLoadOrder(const std::wstring& config)
{ {
const WCHAR* configName = config.c_str();
std::multimap<int, int>::const_iterator iter = m_ConfigOrders.begin(); std::multimap<int, int>::const_iterator iter = m_ConfigOrders.begin();
for ( ; iter != m_ConfigOrders.end(); ++iter) for ( ; iter != m_ConfigOrders.end(); ++iter)
{ {
if (m_ConfigStrings[(*iter).second].config == config) if (wcscmp(m_ConfigStrings[(*iter).second].config.c_str(), configName) == 0)
{ {
return (*iter).first; return (*iter).first;
} }
@ -1531,35 +1532,34 @@ int CRainmeter::ScanForConfigsRecursive(const std::wstring& path, std::wstring b
{ {
CONFIG config; CONFIG config;
config.config = base; config.config = base;
config.commandBase = ID_CONFIG_FIRST + index;
config.active = 0; config.active = 0;
do do
{ {
const std::wstring filename = fileData.cFileName;
if (fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) if (fileData.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY)
{ {
if (!(wcscmp(L"Backup", fileData.cFileName) == 0 && first) && // Skip the backup folder if (wcscmp(L".", fileData.cFileName) != 0 &&
wcscmp(L".", fileData.cFileName) != 0 && wcscmp(L"..", fileData.cFileName) != 0 &&
wcscmp(L"..", fileData.cFileName) != 0) !(first && wcscmp(L"Backup", fileData.cFileName) == 0)) // Skip the backup folder
{ {
folders.push_back(fileData.cFileName); folders.push_back(filename);
} }
} }
else if (!first) else if (!first)
{ {
// Check whether the extension is ".ini" // Check whether the extension is ".ini"
size_t filenameLen = wcslen(fileData.cFileName); size_t filenameLen = filename.size();
if (filenameLen >= 4 && _wcsicmp(fileData.cFileName + (filenameLen - 4), L".ini") == 0) if (filenameLen >= 4 && _wcsicmp(fileData.cFileName + (filenameLen - 4), L".ini") == 0)
{ {
CONFIGMENU menuItem; CONFIGMENU menuItem;
menuItem.name = fileData.cFileName; menuItem.name = filename;
menuItem.index = m_ConfigStrings.size(); menuItem.index = m_ConfigStrings.size();
menu.push_back(menuItem); menu.push_back(menuItem);
if (config.iniFiles.empty()) config.iniFiles.push_back(filename);
{
config.commandBase = ID_CONFIG_FIRST + index;
}
config.iniFiles.push_back(fileData.cFileName);
++index; ++index;
} }
} }