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

!SetWallpaper: Additional fix to 3104a53

Browse Source 
http://rainmeter.net/forum/viewtopic.php?f=14&t=16074

If it still causes crash, it might need to create a clone image first before saving as a bitmap.
This commit is contained in:
spx 2013-07-17 06:17:34 +09:00
parent f76634055d
commit 8f2f65c1fc
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Library/System.cpp
View File

@ -1147,13 +1147,13 @@ void System::SetWallpaper(const std::wstring& wallpaper, const std::wstring& sty
return;
}
Bitmap* bitmap = Bitmap::FromFile(wallpaper.c_str());
if (bitmap && bitmap->GetLastStatus() == Ok)
Bitmap bitmap(wallpaper.c_str());
if (bitmap.GetLastStatus() == Ok)
{
std::wstring file = GetRainmeter().GetSettingsPath() + L"Wallpaper.bmp";
const CLSID bmpClsid = { 0x557cf400, 0x1a04, 0x11d3, { 0x9a, 0x73, 0x0, 0x0, 0xf8, 0x1e, 0xf3, 0x2e } };
if (bitmap->Save(file.c_str(), &bmpClsid) == Ok)
if (bitmap.Save(file.c_str(), &bmpClsid) == Ok)
{
if (!style.empty())
{
@ -1206,8 +1206,6 @@ void System::SetWallpaper(const std::wstring& wallpaper, const std::wstring& sty
SystemParametersInfo(SPI_SETDESKWALLPAPER, 0, (void*)file.c_str(), SPIF_UPDATEINIFILE);
}
}
delete bitmap;
}
}