Minor tweaks.

This commit is contained in:
spx
2011-11-28 14:13:20 +00:00
parent c0cc3f2e70
commit f28ecf6e83
17 changed files with 86 additions and 80 deletions

View File

@@ -134,11 +134,15 @@ void CMeasureScript::ReadConfig(CConfigParser& parser, const WCHAR* section)
// Read common configs
CMeasure::ReadConfig(parser, section);
const std::wstring& file = parser.ReadString(section, L"ScriptFile", L"");
std::wstring file = parser.ReadString(section, L"ScriptFile", L"");
if (!file.empty())
{
std::string scriptFile = ConvertToAscii(m_MeterWindow->MakePathAbsolute(file).c_str());
if (m_MeterWindow)
{
m_MeterWindow->MakePathAbsolute(file);
}
std::string scriptFile = ConvertToAscii(file.c_str());
if (!m_Initialized ||
strcmp(scriptFile.c_str(), m_ScriptFile.c_str()) != 0)