Fixed relative paths with !SetWallpaper

This commit is contained in:
Birunthan Mohanathas 2012-05-21 12:08:31 +03:00
parent 4d18141696
commit c8b35fb616

View File

@ -427,15 +427,20 @@ void CRainmeter::Bang_SetClip(std::vector<std::wstring>& args)
** !SetWallpaper bang ** !SetWallpaper bang
** **
*/ */
void CRainmeter::Bang_SetWallpaper(std::vector<std::wstring>& args) void CRainmeter::Bang_SetWallpaper(std::vector<std::wstring>& args, CMeterWindow* meterWindow)
{ {
if (args.size() == 1) const size_t argsSize = args.size();
if (argsSize >= 1 && argsSize <= 2)
{ {
CSystem::SetWallpaper(args[0], L""); std::wstring& file = args[0];
} const std::wstring& style = (argsSize == 2) ? args[1] : L"";
else if (args.size() == 2)
{ if (meterWindow)
CSystem::SetWallpaper(args[0], args[1]); {
meterWindow->MakePathAbsolute(file);
}
CSystem::SetWallpaper(file, style);
} }
else else
{ {