From 985611332ab355bc18a35be8847eca37bda1e550 Mon Sep 17 00:00:00 2001 From: agsantos <aline.gondimsantos@savoirfairelinux.com> Date: Fri, 26 Mar 2021 10:13:16 -0400 Subject: [PATCH] plugins: fix load status after (un)install GitLab: #490 Change-Id: Ibf7adde8afaef36c421358d13aaff2551e3ca81b --- src/plugin/jamipluginmanager.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/plugin/jamipluginmanager.cpp b/src/plugin/jamipluginmanager.cpp index 250e1b73bd..38a14e6f18 100644 --- a/src/plugin/jamipluginmanager.cpp +++ b/src/plugin/jamipluginmanager.cpp @@ -30,6 +30,7 @@ #include <msgpack.hpp> #include "manager.h" #include "preferences.h" +#include "dring/plugin_manager_interface.h" extern "C" { #include <archive.h> @@ -139,7 +140,7 @@ JamiPluginManager::installPlugin(const std::string& jplPath, bool force) destinationDir, PluginUtils::uncompressJplFunction); } - loadPlugin(destinationDir); + DRing::loadPlugin(destinationDir); } catch (const std::exception& e) { JAMI_ERR() << e.what(); } @@ -156,7 +157,7 @@ JamiPluginManager::uninstallPlugin(const std::string& rootPath) bool loaded = pm_.checkLoadedPlugin(rootPath); if (loaded) { JAMI_INFO() << "PLUGIN: unloading before uninstall."; - bool status = unloadPlugin(rootPath); + bool status = DRing::unloadPlugin(rootPath); if (!status) { JAMI_INFO() << "PLUGIN: could not unload, not performing uninstall."; return -1; -- GitLab