diff --git a/Application/Application.rc b/Application/Application.rc index e6595a77..88c1d6c6 100644 --- a/Application/Application.rc +++ b/Application/Application.rc @@ -28,8 +28,8 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,3,0,539 - PRODUCTVERSION 1,3,0,539 + FILEVERSION 1,3,0,550 + PRODUCTVERSION 1,3,0,550 FILEFLAGSMASK 0x17L #ifdef _DEBUG FILEFLAGS 0x1L @@ -45,12 +45,12 @@ BEGIN BLOCK "040b04b0" BEGIN VALUE "FileDescription", "Rainmeter - A Customizable Resource Meter" - VALUE "FileVersion", "1, 3, 0, 539" + VALUE "FileVersion", "1, 3, 0, 550" VALUE "InternalName", "Rainmeter" VALUE "LegalCopyright", "Copyright (C) 2010 - Rainy" VALUE "OriginalFilename", "Rainmeter.exe" VALUE "ProductName", "Rainmeter" - VALUE "ProductVersion", "1, 3, 0, 539" + VALUE "ProductVersion", "1, 3, 0, 550" END END BLOCK "VarFileInfo" diff --git a/Library/MeterWindow.cpp b/Library/MeterWindow.cpp index 349a01b9..643cf910 100644 --- a/Library/MeterWindow.cpp +++ b/Library/MeterWindow.cpp @@ -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 { diff --git a/revision-number.h b/revision-number.h index c324b19e..fe5efbc7 100644 --- a/revision-number.h +++ b/revision-number.h @@ -1,3 +1,3 @@ #pragma once -const int revision_number = 539; +const int revision_number = 550; const bool revision_beta = true; \ No newline at end of file