fix: fixed static global variable causing variable content overwrite

Qv2ray · Sep 22, 2020 · 982e2ec · 982e2ec
1 parent 6d7761e
commit 982e2ec
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,7 +14,6 @@ set(CMAKE_AUTORCC ON)
 find_package(Qt5 COMPONENTS Core Widgets Gui REQUIRED)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-set(QVPLUGIN_INTERFACE_INCLUDE_DIR "interface/")
 include(interface/QvPluginInterface.cmake)
 include(interface/QvGUIPluginInterface.cmake)
 include_directories(${QVPLUGIN_INTERFACE_INCLUDE_DIR})

diff --git a/TrojanGoPlugin.cpp b/TrojanGoPlugin.cpp
@@ -9,6 +9,7 @@
 bool QvTrojanGoPlugin::InitializePlugin(const QString &, const QJsonObject &)
 {
     emit PluginLog("Initialize plugin.");
+    PluginInstance = this;
     outboundHandler = std::make_shared<TrojanGoSerializer>();
     eventHandler = std::make_shared<SimpleEventHandler>();
     kernelInterface = std::make_unique<TrojanGoPluginKernelInterface>();

diff --git a/TrojanGoPlugin.hpp b/TrojanGoPlugin.hpp
@@ -12,13 +12,12 @@ using namespace Qv2rayPlugin;
 
 class QvTrojanGoPlugin
     : public QObject
-    , Qv2rayInterface
+    , public Qv2rayInterface
 {
     Q_INTERFACES(Qv2rayPlugin::Qv2rayInterface)
     Q_PLUGIN_METADATA(IID Qv2rayInterface_IID)
     Q_OBJECT
   public:
-    //
     // Basic metainfo of this plugin
     const QvPluginMetadata GetMetadata() const override
     {
@@ -43,3 +42,5 @@ class QvTrojanGoPlugin
     void PluginLog(const QString &) const override;
     void PluginErrorMessageBox(const QString &, const QString &) const override;
 };
+
+inline QvTrojanGoPlugin *PluginInstance;
diff --git a/core/Kernel.cpp b/core/Kernel.cpp
@@ -12,10 +12,10 @@ QvTrojanGoPluginKernel::QvTrojanGoPluginKernel() : Qv2rayPlugin::PluginKernel()
 
 bool QvTrojanGoPluginKernel::StartKernel()
 {
-    const auto executablePath = pluginInstance->GetSettngs()["kernelPath"].toString();
+    const auto executablePath = PluginInstance->GetSettngs()["kernelPath"].toString();
     if (!QFile::exists(executablePath))
     {
-        pluginInstance->PluginErrorMessageBox(tr("Stupid Configuration?"),
+        PluginInstance->PluginErrorMessageBox(tr("Stupid Configuration?"),
                                               tr("We cannot find your Trojan-Go kernel. Please configure it in the plugin settings."));
         return false;
     }

diff --git a/interface b/interface
+8 −2		QvGUIPluginInterface.cmake
+16 −0		QvGUIPluginInterface.hpp
+13 −9		QvPluginInterface.cmake
+1 −6		QvPluginInterface.hpp