From 3eb1bffb702fa5a8bf330d94fae648fcc2035acd Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Thu, 23 Jul 2015 18:16:06 -0700 Subject: [PATCH] Improved variable name for plugin loading on Windows #4866 --- src/lib/arch/win32/ArchPluginWindows.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/arch/win32/ArchPluginWindows.cpp b/src/lib/arch/win32/ArchPluginWindows.cpp index 7a8c6248..7d26520f 100644 --- a/src/lib/arch/win32/ArchPluginWindows.cpp +++ b/src/lib/arch/win32/ArchPluginWindows.cpp @@ -58,7 +58,7 @@ ArchPluginWindows::load() std::vector::iterator it; for (it = plugins.begin(); it != plugins.end(); ++it) { String filename = *it; - String nameNoExt = synergy::string::removeFileExt(*it); + String name = synergy::string::removeFileExt(filename); String path = synergy::string::sprintf( "%s\\%s", dir.c_str(), filename.c_str()); @@ -73,8 +73,8 @@ ArchPluginWindows::load() continue; } - String expectedVersion = getExpectedPluginVersion(nameNoExt.c_str()); - String currentVersion = getCurrentVersion(nameNoExt.c_str(), voidHandle); + String expectedVersion = getExpectedPluginVersion(name.c_str()); + String currentVersion = getCurrentVersion(name.c_str(), voidHandle); if (currentVersion.empty() || (expectedVersion != currentVersion)) { LOG((CLOG_ERR @@ -92,7 +92,7 @@ ArchPluginWindows::load() filename.c_str(), currentVersion.c_str())); - m_pluginTable.insert(std::make_pair(nameNoExt, voidHandle)); + m_pluginTable.insert(std::make_pair(name, voidHandle)); } }