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 that Rainmeter crashes when [] is in bang. E.g. !SetVariable test "blaa[]"

Browse Source
This commit is contained in:
Birunthan Mohanathas 2011-07-29 17:46:21 +00:00
parent e74d6f4619
commit 5c1334dbd6
1 changed files with 27 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
Library/Rainmeter.cpp
View File

@ -3167,50 +3167,46 @@ std::wstring CRainmeter::ParseCommand(const WCHAR* command, CMeterWindow* meterW
start = strCommand.find(L'[', start); start = strCommand.find(L'[', start);
if (start != std::wstring::npos) if (start != std::wstring::npos)
{ {
end = strCommand.find(L']', start); end = strCommand.find(L']', start + 1);
if (end != std::wstring::npos) if (end != std::wstring::npos)
{ {
std::wstring measureName = strCommand.substr(start + 1, end - (start + 1)); std::wstring measureName = strCommand.substr(start + 1, end - (start + 1));
if (!measureName.empty()) if (!measureName.empty() && measureName[0] != L'!') // Ignore bangs
{ {
// Ignore bangs if (meterWindow)
if (measureName[0] == L'!')
{ {
start = end + 1; if (strCommand[start + 1] == L'*' && strCommand[end - 1] == L'*')
}
else
{
if (meterWindow)
{ {
if (strCommand[start + 1] == L'*' && strCommand[end - 1] == L'*') strCommand.erase(start + 1, 1);
strCommand.erase(end - 2, 1);
start = end - 1;
}
else
{
const std::list<CMeasure*>& measures = meterWindow->GetMeasures();
std::list<CMeasure*>::const_iterator iter = measures.begin();
for ( ; iter != measures.end(); ++iter)
{ {
strCommand.erase(start + 1, 1); if (_wcsicmp((*iter)->GetName(), measureName.c_str()) == 0)
strCommand.erase(end - 2, 1); {
start = end - 1; std::wstring value = (*iter)->GetStringValue(AUTOSCALE_OFF, 1, -1, false);
strCommand.replace(start, (end - start) + 1, value);
start += value.length();
break;
}
} }
else if (iter == measures.end())
{ {
const std::list<CMeasure*>& measures = meterWindow->GetMeasures(); //LogWithArgs(LOG_WARNING, L"No such measure [%s] for execute string: %s", measureName.c_str(), command);
std::list<CMeasure*>::const_iterator iter = measures.begin(); start = end + 1;
for ( ; iter != measures.end(); ++iter)
{
if (_wcsicmp((*iter)->GetName(), measureName.c_str()) == 0)
{
std::wstring value = (*iter)->GetStringValue(AUTOSCALE_OFF, 1, -1, false);
strCommand.replace(start, (end - start) + 1, value);
start += value.length();
break;
}
}
if (iter == measures.end())
{
//LogWithArgs(LOG_WARNING, L"No such measure [%s] for execute string: %s", measureName.c_str(), command);
start = end + 1;
}
} }
} }
} }
} }
else
{
start = end + 1;
}
} }
} }
} }