mirror of
https://github.com/chibicitiberiu/rainmeter-studio.git
synced 2024-02-24 04:33:31 +00:00
Cosmetics
This commit is contained in:
parent
d7fb5f4bb5
commit
1e66d1a3c2
@ -129,12 +129,14 @@ void CMeasurePlugin::ReadOptions(CConfigParser& parser, const WCHAR* section)
|
|||||||
}
|
}
|
||||||
|
|
||||||
// First try from program path
|
// 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());
|
m_Plugin = CSystem::RmLoadLibrary(pluginFile.c_str());
|
||||||
if (!m_Plugin)
|
if (!m_Plugin)
|
||||||
{
|
{
|
||||||
// Try from settings path
|
// Try from settings path
|
||||||
pluginFile = Rainmeter->GetUserPluginPath() + pluginName;
|
pluginFile = Rainmeter->GetUserPluginPath();
|
||||||
|
pluginFile += pluginName;
|
||||||
m_Plugin = CSystem::RmLoadLibrary(pluginFile.c_str());
|
m_Plugin = CSystem::RmLoadLibrary(pluginFile.c_str());
|
||||||
if (!m_Plugin)
|
if (!m_Plugin)
|
||||||
{
|
{
|
||||||
|
@ -884,14 +884,11 @@ int CRainmeter::Initialize(LPCWSTR iniPath)
|
|||||||
m_SkinPath.assign(buffer, len);
|
m_SkinPath.assign(buffer, len);
|
||||||
ExpandEnvironmentVariables(m_SkinPath);
|
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 &&
|
else if (bDefaultIniLocation &&
|
||||||
SUCCEEDED(SHGetFolderPath(NULL, CSIDL_MYDOCUMENTS, NULL, SHGFP_TYPE_CURRENT, buffer)))
|
SUCCEEDED(SHGetFolderPath(NULL, CSIDL_MYDOCUMENTS, NULL, SHGFP_TYPE_CURRENT, buffer)))
|
||||||
{
|
{
|
||||||
|
@ -489,8 +489,8 @@ bool CDialogInstall::ReadPackage()
|
|||||||
{
|
{
|
||||||
m_PackageSkins.insert(item);
|
m_PackageSkins.insert(item);
|
||||||
}
|
}
|
||||||
else if (_wcsicmp(component, m_PackageFormat == PackageFormat::Old ? L"Themes" : L"Layouts") == 0 &&
|
else if (_wcsicmp(component, m_PackageFormat == PackageFormat::New ? L"Layouts" : L"Themes") == 0 &&
|
||||||
_wcsicmp(extension, m_PackageFormat == PackageFormat::Old ? L".thm" : L".ini") == 0 &&
|
_wcsicmp(extension, m_PackageFormat == PackageFormat::New ? L".ini" : L".thm") == 0 &&
|
||||||
!IsIgnoredTheme(itemSz))
|
!IsIgnoredTheme(itemSz))
|
||||||
{
|
{
|
||||||
m_PackageThemes.insert(item);
|
m_PackageThemes.insert(item);
|
||||||
|
Loading…
Reference in New Issue
Block a user