mirror of
https://github.com/debauchee/barrier.git
synced 2026-02-13 15:15:21 +08:00
Improved variable name for plugin loading on Windows #4866
This commit is contained in:
committed by
Jerry (Xinyu Hou)
parent
cb5f0f7b12
commit
3eb1bffb70
@@ -58,7 +58,7 @@ ArchPluginWindows::load()
|
||||
std::vector<String>::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));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user