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

Minor fixes

Browse Source
This commit is contained in:
spx 2012-06-21 02:06:17 -07:00
parent 6456b6adb3
commit 6c5cd602bc
4 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
Language/Hungarian.h
View File

Binary file not shown.

5
Library/DialogAbout.cpp
View File

@ -1039,7 +1039,10 @@ void CDialogAbout::CTabPlugins::Initialize()
}; };
findPlugins(Rainmeter->GetPluginPath()); findPlugins(Rainmeter->GetPluginPath());
findPlugins(Rainmeter->GetUserPluginPath()); if (Rainmeter->HasUserPluginPath())
{
findPlugins(Rainmeter->GetUserPluginPath());
}
} }
/* /*

11
Library/MeasurePlugin.cpp
View File

@ -134,10 +134,13 @@ void CMeasurePlugin::ReadOptions(CConfigParser& parser, const WCHAR* section)
m_Plugin = CSystem::RmLoadLibrary(pluginFile.c_str()); m_Plugin = CSystem::RmLoadLibrary(pluginFile.c_str());
if (!m_Plugin) if (!m_Plugin)
{ {
// Try from settings path if (Rainmeter->HasUserPluginPath())
pluginFile = Rainmeter->GetUserPluginPath(); {
pluginFile += pluginName; // Try from settings path
m_Plugin = CSystem::RmLoadLibrary(pluginFile.c_str()); pluginFile = Rainmeter->GetUserPluginPath();
pluginFile += pluginName;
m_Plugin = CSystem::RmLoadLibrary(pluginFile.c_str());
}
if (!m_Plugin) if (!m_Plugin)
{ {
LogWithArgs(LOG_ERROR, L"Plugin: \"%s\" not found", pluginName.c_str()); LogWithArgs(LOG_ERROR, L"Plugin: \"%s\" not found", pluginName.c_str());

2
Library/Rainmeter.h
View File

@ -143,6 +143,8 @@ public:
std::wstring GetUserPluginPath() { return m_SettingsPath + L"Plugins\\"; } std::wstring GetUserPluginPath() { return m_SettingsPath + L"Plugins\\"; }
std::wstring GetAddonPath() { return m_SettingsPath + L"Addons\\"; } std::wstring GetAddonPath() { return m_SettingsPath + L"Addons\\"; }
bool HasUserPluginPath() { return (_wcsicmp(m_Path.c_str(), m_SettingsPath.c_str()) != 0); }
std::wstring GetDefaultSkinPath() { return m_Path + L"Defaults\\Skins\\"; } std::wstring GetDefaultSkinPath() { return m_Path + L"Defaults\\Skins\\"; }
std::wstring GetDefaultThemePath() { return m_Path + L"Defaults\\Themes\\"; } std::wstring GetDefaultThemePath() { return m_Path + L"Defaults\\Themes\\"; }
std::wstring GetDefaultPluginPath() { return m_Path + L"Defaults\\Plugins\\"; } std::wstring GetDefaultPluginPath() { return m_Path + L"Defaults\\Plugins\\"; }