Change by JamesAC to detect skins with no meters OR measures to reduce issues with people loading Rainlendar skins and such.

This commit is contained in:
jsmorley
2010-09-22 14:04:00 +00:00
parent 15992c2dc3
commit c1fda93526
3 changed files with 16 additions and 7 deletions

View File

@ -2018,11 +2018,20 @@ bool CMeterWindow::ReadSkin()
text += m_SkinName;
text += L"\\";
text += m_SkinIniFile;
text += L"\" does not contain any meters.\nDo you want to deactivate this skin?";
if (IDYES == MessageBox(m_Window, text.c_str(), APPNAME, MB_YESNO | MB_TOPMOST | MB_ICONEXCLAMATION))
if (m_Measures.empty())
{
text += L"\" does not contain\nany valid meters or measures and will be deactivated.\n\nThe file may be damaged or not a Rainmeter skin file.";
MessageBox(m_Window, text.c_str(), APPNAME, MB_OK | MB_TOPMOST | MB_ICONEXCLAMATION);
m_Rainmeter->DeactivateConfig(this, -1);
}
else
{
text += L"\" does not contain any meters.\nDo you want to deactivate this skin?";
if (IDYES == MessageBox(m_Window, text.c_str(), APPNAME, MB_YESNO | MB_TOPMOST | MB_ICONEXCLAMATION))
{
m_Rainmeter->DeactivateConfig(this, -1);
}
}
}
else
{