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

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Application/Application.rc
View File

@ -28,8 +28,8 @@ LANGUAGE LANG_FINNISH, SUBLANG_DEFAULT
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,3,0,539 FILEVERSION 1,3,0,550
PRODUCTVERSION 1,3,0,539 PRODUCTVERSION 1,3,0,550
FILEFLAGSMASK 0x17L FILEFLAGSMASK 0x17L
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -45,12 +45,12 @@ BEGIN
BLOCK "040b04b0" BLOCK "040b04b0"
BEGIN BEGIN
VALUE "FileDescription", "Rainmeter - A Customizable Resource Meter" VALUE "FileDescription", "Rainmeter - A Customizable Resource Meter"
VALUE "FileVersion", "1, 3, 0, 539" VALUE "FileVersion", "1, 3, 0, 550"
VALUE "InternalName", "Rainmeter" VALUE "InternalName", "Rainmeter"
VALUE "LegalCopyright", "Copyright (C) 2010 - Rainy" VALUE "LegalCopyright", "Copyright (C) 2010 - Rainy"
VALUE "OriginalFilename", "Rainmeter.exe" VALUE "OriginalFilename", "Rainmeter.exe"
VALUE "ProductName", "Rainmeter" VALUE "ProductName", "Rainmeter"
VALUE "ProductVersion", "1, 3, 0, 539" VALUE "ProductVersion", "1, 3, 0, 550"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

9
Library/MeterWindow.cpp
View File

@ -2018,12 +2018,21 @@ bool CMeterWindow::ReadSkin()
text += m_SkinName; text += m_SkinName;
text += L"\\"; text += L"\\";
text += m_SkinIniFile; text += m_SkinIniFile;
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?"; 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 (IDYES == MessageBox(m_Window, text.c_str(), APPNAME, MB_YESNO | MB_TOPMOST | MB_ICONEXCLAMATION))
{ {
m_Rainmeter->DeactivateConfig(this, -1); m_Rainmeter->DeactivateConfig(this, -1);
} }
} }
}
else else
{ {
// Bind the meters to the measures // Bind the meters to the measures

2
revision-number.h
View File

@ -1,3 +1,3 @@
#pragma once #pragma once
const int revision_number = 539; const int revision_number = 550;
const bool revision_beta = true; const bool revision_beta = true;