SHS/pip
4
3
Fork 0
Code Issues 67 Pull Requests 1 Actions Releases Wiki Activity

fix plugin path in picout

Browse Source
This commit is contained in:
Бычков Андрей
2020-12-23 16:52:27 +03:00
parent 8bfd466f6b
commit 587d90f269
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libs/main/system/piplugin.cpp
View File

@@ -255,7 +255,7 @@ bool PIPluginLoader::load(const PIString & name) {
if (!lib.load(findLibrary(name))) { if (!lib.load(findLibrary(name))) {
unload(); unload();
error = LibraryLoadError; error = LibraryLoadError;
error_str = "Load plugin \"" + name + "\" error: can`t load lib: " + lib.lastError(); error_str = "Load plugin \"" + lib.path() + "\" error: can`t load lib: " + lib.lastError();
if (messages) piCout << error_str; if (messages) piCout << error_str;
return false; return false;
} }
@@ -264,14 +264,14 @@ bool PIPluginLoader::load(const PIString & name) {
if (!func_loader_version) { if (!func_loader_version) {
unload(); unload();
error = MissingSymbols; error = MissingSymbols;
error_str = "Load plugin \"" + name + "\" error: can`t find " + STR(__PIP_PLUGIN_LOADER_VERSION_FUNC__); error_str = "Load plugin \"" + lib.path() + "\" error: can`t find " + STR(__PIP_PLUGIN_LOADER_VERSION_FUNC__);
if (messages) piCout << error_str; if (messages) piCout << error_str;
return false; return false;
} }
if (__PIP_PLUGIN_LOADER_VERSION__ != func_loader_version()) { if (__PIP_PLUGIN_LOADER_VERSION__ != func_loader_version()) {
unload(); unload();
error = InvalidLoaderVersion; error = InvalidLoaderVersion;
error_str = "Load plugin \"" + name + "\" error: invalid loader version: application = " + PIString::fromNumber(func_loader_version()) error_str = "Load plugin \"" + lib.path() + "\" error: invalid loader version: application = " + PIString::fromNumber(func_loader_version())
+ ", plugin = " + PIString::fromNumber(__PIP_PLUGIN_LOADER_VERSION__); + ", plugin = " + PIString::fromNumber(__PIP_PLUGIN_LOADER_VERSION__);
if (messages) piCout << error_str; if (messages) piCout << error_str;
return false; return false;
@@ -281,7 +281,7 @@ bool PIPluginLoader::load(const PIString & name) {
if (pversion != lversion) { if (pversion != lversion) {
unload(); unload();
error = InvalidUserVersion; error = InvalidUserVersion;
error_str = "Load plugin \"" + name + "\" error: invalid user version: application = " + lversion + ", plugin = " + pversion; error_str = "Load plugin \"" + lib.path() + "\" error: invalid user version: application = " + lversion + ", plugin = " + pversion;
if (messages) piCout << error_str; if (messages) piCout << error_str;
return false; return false;
} }