fix: fixed static global variable causing variable content overwrite

Qv2ray · Sep 22, 2020 · e1ba5be · e1ba5be
1 parent 942a326
commit e1ba5be
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/SimplePlugin.cpp b/SimplePlugin.cpp
@@ -9,10 +9,11 @@
 #include <QLabel>
 #include <QMetaEnum>
 
-bool NaiveProxyPlugin::InitializePlugin(const QString &, const QJsonObject &settings)
+bool NaiveProxyPlugin::InitializePlugin(const QString &, const QJsonObject &_settings)
 {
+    this->settings = _settings;
+    NaiveProxyPluginInstance = this;
     emit PluginLog("Initializing NaiveProxy plugin.");
-    this->settings = settings;
     this->outboundHandler = std::make_unique<NaiveProxyOutboundHandler>();
     this->eventHandler = std::make_unique<NaiveEventHandler>();
     this->kernelInterface = std::make_shared<NaiveKernelInterface>();

diff --git a/SimplePlugin.hpp b/SimplePlugin.hpp
@@ -9,7 +9,7 @@ using namespace Qv2rayPlugin;
 
 class NaiveProxyPlugin
     : public QObject
-    , Qv2rayInterface
+    , public Qv2rayInterface
 {
     Q_INTERFACES(Qv2rayPlugin::Qv2rayInterface)
     Q_PLUGIN_METADATA(IID Qv2rayInterface_IID)
@@ -38,3 +38,5 @@ class NaiveProxyPlugin
     void PluginLog(const QString &) const override;
     void PluginErrorMessageBox(const QString &, const QString &) const override;
 };
+
+DECLARE_PLUGIN_INSTANCE(NaiveProxyPlugin);
diff --git a/core/Kernel.cpp b/core/Kernel.cpp
@@ -21,11 +21,11 @@ NaiveProxyKernel::NaiveProxyKernel() : Qv2rayPlugin::PluginKernel()
 
 bool NaiveProxyKernel::StartKernel()
 {
-    const auto executablePath = pluginInstance->GetSettngs()["kernelPath"].toString();
+    const auto executablePath = NaiveProxyPluginInstance->GetSettngs()["kernelPath"].toString();
     if (!QFile::exists(executablePath))
     {
-        pluginInstance->PluginErrorMessageBox(tr("Naive!"),
-                                              tr("We cannot find your NaiveProxy kernel. Please configure it in the plugin settings."));
+        NaiveProxyPluginInstance->PluginErrorMessageBox(
+            tr("Naive!"), tr("We cannot find your NaiveProxy kernel. Please configure it in the plugin settings."));
         return false;
     }
 

diff --git a/interface b/interface
diff --git a/ui/SettingsWidget.hpp b/ui/SettingsWidget.hpp
@@ -32,13 +32,14 @@ class SettingsWidget
         }
         textKernelPath->setText(root.value("kernelPath").toString());
     }
+
     QJsonObject GetSettings() override
     {
         return root;
     }
 
   protected:
-    void changeEvent(QEvent *e);
+    void changeEvent(QEvent *e) override;
 
   private slots:
     void on_textKernelPath_textEdited(const QString &arg1);
+8 −2		QvGUIPluginInterface.cmake
+16 −0		QvGUIPluginInterface.hpp
+13 −9		QvPluginInterface.cmake
+3 −6		QvPluginInterface.hpp