rayelliott
/
barrier
mirror of https://github.com/debauchee/barrier.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Improved variable name for plugin loading on Windows #4866

This commit is contained in:
Nick Bolton 2015-07-23 18:16:06 -07:00 committed by Jerry (Xinyu Hou)
parent cb5f0f7b12
commit 3eb1bffb70
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lib/arch/win32/ArchPluginWindows.cpp
View File

@ -58,7 +58,7 @@ ArchPluginWindows::load()
std::vector<String>::iterator it; std::vector<String>::iterator it;
for (it = plugins.begin(); it != plugins.end(); ++it) { for (it = plugins.begin(); it != plugins.end(); ++it) {
String filename = *it; String filename = *it;
String nameNoExt = synergy::string::removeFileExt(*it); String name = synergy::string::removeFileExt(filename);
String path = synergy::string::sprintf( String path = synergy::string::sprintf(
"%s\\%s", dir.c_str(), filename.c_str()); "%s\\%s", dir.c_str(), filename.c_str());
@ -73,8 +73,8 @@ ArchPluginWindows::load()
continue; continue;
} }
String expectedVersion = getExpectedPluginVersion(nameNoExt.c_str()); String expectedVersion = getExpectedPluginVersion(name.c_str());
String currentVersion = getCurrentVersion(nameNoExt.c_str(), voidHandle); String currentVersion = getCurrentVersion(name.c_str(), voidHandle);
if (currentVersion.empty() || (expectedVersion != currentVersion)) { if (currentVersion.empty() || (expectedVersion != currentVersion)) {
LOG((CLOG_ERR LOG((CLOG_ERR
@ -92,7 +92,7 @@ ArchPluginWindows::load()
filename.c_str(), filename.c_str(),
currentVersion.c_str())); currentVersion.c_str()));
m_pluginTable.insert(std::make_pair(nameNoExt, voidHandle)); m_pluginTable.insert(std::make_pair(name, voidHandle));
} }
} }