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

Moved addons and non-default plugins to #SETTINGSPATH#

Browse Source
This commit is contained in:
Birunthan Mohanathas
2012-06-09 18:38:45 +03:00
parent 1b4d45e81c
commit 87817bc050
5 changed files with 204 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Library/MeasurePlugin.cpp
View File

@ -117,22 +117,30 @@ void CMeasurePlugin::ReadOptions(CConfigParser& parser, const WCHAR* section)
}
const std::wstring& plugin = parser.ReadString(section, L"Plugin", L"");
std::wstring pluginFile = Rainmeter->GetPluginPath();
size_t pos = plugin.find_last_of(L"\\/");
std::wstring pluginName;
if (pos != std::wstring::npos)
{
pluginFile.append(plugin, pos, plugin.length() - pos);
pluginName.assign(plugin, pos, plugin.length() - pos);
}
else
{
pluginFile += plugin;
pluginName = plugin;
}
// First try from program path
std::wstring pluginFile = Rainmeter->GetPluginPath() + pluginName;
m_Plugin = CSystem::RmLoadLibrary(pluginFile.c_str());
if (m_Plugin == NULL)
if (!m_Plugin)
{
LogWithArgs(LOG_ERROR, L"Plugin: \"%s\" not found", pluginFile.c_str());
return;
// Try from settings path
pluginFile = Rainmeter->GetUserPluginPath() + pluginName;
m_Plugin = CSystem::RmLoadLibrary(pluginFile.c_str());
if (!m_Plugin)
{
LogWithArgs(LOG_ERROR, L"Plugin: \"%s\" not found", pluginName.c_str());
return;
}
}
FARPROC initializeFunc = GetProcAddress(m_Plugin, "Initialize");