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

Added workaround for old plugins using relative path to Rainmeter.exe

Browse Source
This commit is contained in:
Birunthan Mohanathas
2012-06-09 19:45:27 +03:00
parent 87817bc050
commit 83f1b1ae0e
8 changed files with 312 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Library/Rainmeter.cpp
View File

@ -911,7 +911,7 @@ int CRainmeter::Initialize(LPCWSTR iniPath)
}
// Create user skins, themes, addons, and plugins folders if needed
CreateComponentFolders();
CreateComponentFolders(bDefaultIniLocation);
// Create a default Rainmeter.ini file if needed
if (_waccess(iniFile, 0) == -1)
@ -1180,7 +1180,7 @@ void CRainmeter::CreateDataFile()
}
}
void CRainmeter::CreateComponentFolders()
void CRainmeter::CreateComponentFolders(bool defaultIniLocation)
{
if (CreateDirectory(m_SkinPath.c_str(), NULL))
{
@ -1200,23 +1200,37 @@ void CRainmeter::CreateComponentFolders()
}
}
path = GetUserPluginPath();
if (_waccess(path.c_str(), 0) == -1)
if (defaultIniLocation)
{
std::wstring from = GetDefaultPluginPath();
if (_waccess(from.c_str(), 0) != -1)
path = GetUserPluginPath();
if (_waccess(path.c_str(), 0) == -1)
{
CSystem::CopyFiles(from, m_SettingsPath);
std::wstring from = GetDefaultPluginPath();
if (_waccess(from.c_str(), 0) != -1)
{
CSystem::CopyFiles(from, m_SettingsPath);
}
}
}
path = GetAddonPath();
if (_waccess(path.c_str(), 0) == -1)
{
std::wstring from = GetDefaultAddonPath();
if (_waccess(from.c_str(), 0) != -1)
path = GetAddonPath();
if (_waccess(path.c_str(), 0) == -1)
{
CSystem::CopyFiles(from, m_SettingsPath);
std::wstring from = GetDefaultAddonPath();
if (_waccess(from.c_str(), 0) != -1)
{
CSystem::CopyFiles(from, m_SettingsPath);
}
}
path = m_SettingsPath;
path += L"Rainmeter.exe";
if (_waccess(path.c_str(), 0) == -1)
{
// Create a hidden dummy Rainmeter.exe into SettingsPath for old addon
// using relative path to Rainmeter.exe
std::wstring from = m_Path + L"Launcher.exe";
CSystem::CopyFiles(from, path);
SetFileAttributes(path.c_str(), FILE_ATTRIBUTE_HIDDEN);
}
}
}

2
Library/Rainmeter.h
View File

@ -257,7 +257,7 @@ private:
void CreateMonitorMenu(HMENU monitorMenu, CMeterWindow* meterWindow);
void CreateOptionsFile();
void CreateDataFile();
void CreateComponentFolders();
void CreateComponentFolders(bool defaultIniLocation);
void SetLogging(bool logging);
void TestSettingsFile(bool bDefaultIniLocation);