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

Reverted the changes from r209.

Browse Source
This commit is contained in:
Kimmo Pekkola
2009-09-04 16:37:51 +00:00
parent 8239919333
commit 4bf4e51126
16 changed files with 116 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
Library/MeterWindow.cpp
View File

@ -38,7 +38,6 @@
#include "MeasureNet.h"
#include "MeasurePlugin.h"
#include "MeterButton.h"
#include <algorithm>
using namespace Gdiplus;
@ -1522,7 +1521,7 @@ void CMeterWindow::ReadSkin()
{
int res = GetPrivateProfileString( NULL, NULL, NULL, items, size, iniFile.c_str());
if (res == 0) return; // File not found
if (res != size - 2) break; // Fits in the buffer
if (res < size - 2) break; // Fits in the buffer
delete [] items;
size *= 2;
@ -1536,12 +1535,11 @@ void CMeterWindow::ReadSkin()
wcsicmp(L"Variables", pos) != 0 &&
wcsicmp(L"Metadata", pos) != 0)
{
std::wstring meterName, measureName, styleName;
std::wstring meterName, measureName;
// Check if the item is a meter or a measure (or perhaps something else)
measureName = m_Parser.ReadString(pos, L"Measure", L"");
meterName = m_Parser.ReadString(pos, L"Meter", L"");
styleName = m_Parser.ReadString(pos, L"Style", L"");
if (measureName.length() > 0)
{
try
@ -1574,10 +1572,6 @@ void CMeterWindow::ReadSkin()
MessageBox(m_Window, error.GetString().c_str(), APPNAME, MB_OK | MB_TOPMOST | MB_ICONEXCLAMATION);
}
}
else if (styleName.length() > 0)
{
//ignore sections with Style= in them.
}
else
{
// It's something else
@ -3386,4 +3380,3 @@ std::wstring CMeterWindow::MakePathAbsolute(std::wstring path)
return root + path;
}