From 587d90f269d6821ef5c4b7ba8d5301e8c91f2d4d Mon Sep 17 00:00:00 2001 From: andrey Date: Wed, 23 Dec 2020 16:52:27 +0300 Subject: [PATCH] fix plugin path in picout --- libs/main/system/piplugin.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libs/main/system/piplugin.cpp b/libs/main/system/piplugin.cpp index aaa01c55..ed91f87d 100644 --- a/libs/main/system/piplugin.cpp +++ b/libs/main/system/piplugin.cpp @@ -255,7 +255,7 @@ bool PIPluginLoader::load(const PIString & name) { if (!lib.load(findLibrary(name))) { unload(); 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; return false; } @@ -264,14 +264,14 @@ bool PIPluginLoader::load(const PIString & name) { if (!func_loader_version) { unload(); 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; return false; } if (__PIP_PLUGIN_LOADER_VERSION__ != func_loader_version()) { unload(); 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__); if (messages) piCout << error_str; return false; @@ -281,7 +281,7 @@ bool PIPluginLoader::load(const PIString & name) { if (pversion != lversion) { unload(); 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; return false; }