mirror of
https://github.com/chibicitiberiu/rainmeter-studio.git
synced 2024-02-24 04:33:31 +00:00
Cosmetics
This commit is contained in:
@ -129,12 +129,14 @@ void CMeasurePlugin::ReadOptions(CConfigParser& parser, const WCHAR* section)
|
||||
}
|
||||
|
||||
// First try from program path
|
||||
std::wstring pluginFile = Rainmeter->GetPluginPath() + pluginName;
|
||||
std::wstring pluginFile = Rainmeter->GetPluginPath();
|
||||
pluginFile += pluginName;
|
||||
m_Plugin = CSystem::RmLoadLibrary(pluginFile.c_str());
|
||||
if (!m_Plugin)
|
||||
{
|
||||
// Try from settings path
|
||||
pluginFile = Rainmeter->GetUserPluginPath() + pluginName;
|
||||
pluginFile = Rainmeter->GetUserPluginPath();
|
||||
pluginFile += pluginName;
|
||||
m_Plugin = CSystem::RmLoadLibrary(pluginFile.c_str());
|
||||
if (!m_Plugin)
|
||||
{
|
||||
|
@ -884,12 +884,9 @@ int CRainmeter::Initialize(LPCWSTR iniPath)
|
||||
m_SkinPath.assign(buffer, len);
|
||||
ExpandEnvironmentVariables(m_SkinPath);
|
||||
|
||||
if (!m_SkinPath.empty())
|
||||
if (!m_SkinPath.empty() && !CSystem::IsPathSeparator(m_SkinPath[m_SkinPath.length() - 1]))
|
||||
{
|
||||
if (!CSystem::IsPathSeparator(m_SkinPath[m_SkinPath.length() - 1]))
|
||||
{
|
||||
m_SkinPath += L'\\';
|
||||
}
|
||||
m_SkinPath += L'\\';
|
||||
}
|
||||
}
|
||||
else if (bDefaultIniLocation &&
|
||||
|
Reference in New Issue
Block a user