fixes #945

PurpleI2P · Sep 8, 2017 · ef30d2d · ef30d2d
1 parent 1673966
commit ef30d2d
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 6 deletions.
diff --git a/qt/i2pd_qt/ClientTunnelPane.cpp b/qt/i2pd_qt/ClientTunnelPane.cpp
@@ -11,6 +11,7 @@ void ClientTunnelPane::setGroupBoxTitle(const QString & title) {
 }
 
 void ClientTunnelPane::deleteClientTunnelForm() {
+    TunnelPane::deleteTunnelForm();
     delete clientTunnelNameGroupBox;
     clientTunnelNameGroupBox=nullptr;
 

diff --git a/qt/i2pd_qt/ServerTunnelPane.cpp b/qt/i2pd_qt/ServerTunnelPane.cpp
@@ -266,6 +266,7 @@ int ServerTunnelPane::appendServerTunnelForm(
 }
 
 void ServerTunnelPane::deleteServerTunnelForm() {
+    TunnelPane::deleteTunnelForm();
     delete serverTunnelNameGroupBox;//->deleteLater();
     serverTunnelNameGroupBox=nullptr;
 

diff --git a/qt/i2pd_qt/TunnelPane.cpp b/qt/i2pd_qt/TunnelPane.cpp
@@ -218,3 +218,7 @@ QString TunnelPane::readTunnelTypeComboboxData() {
 i2p::data::SigningKeyType TunnelPane::readSigTypeComboboxUI(QComboBox* sigTypeComboBox) {
     return (i2p::data::SigningKeyType) sigTypeComboBox->currentData().toInt();
 }
+
+void TunnelPane::deleteTunnelForm() {
+    widgetlocks.deleteListeners();
+}
diff --git a/qt/i2pd_qt/TunnelPane.h b/qt/i2pd_qt/TunnelPane.h
@@ -31,6 +31,9 @@ class TunnelPane : public QObject {
     TunnelPane(TunnelsPageUpdateListener* tunnelsPageUpdateListener_, TunnelConfig* tunconf);
     virtual ~TunnelPane(){}
 
+    void deleteTunnelForm();
+
+
     virtual ServerTunnelPane* asServerTunnelPane()=0;
     virtual ClientTunnelPane* asClientTunnelPane()=0;
 

diff --git a/qt/i2pd_qt/widgetlock.h b/qt/i2pd_qt/widgetlock.h
@@ -12,6 +12,7 @@ class widgetlock : public QObject {
 private:
     QWidget* widget;
     QPushButton* lockButton;
+
 public slots:
     void lockButtonClicked(bool) {
         bool wasEnabled = widget->isEnabled();
@@ -25,7 +26,8 @@ public slots:
         lockButton->setText(lockButton->tr("Edit"));
         QObject::connect(lockButton,SIGNAL(clicked(bool)), this, SLOT(lockButtonClicked(bool)));
     }
-    virtual ~widgetlock() {
+    virtual ~widgetlock() {}
+    void deleteListener() {
         QObject::disconnect(lockButton,SIGNAL(clicked(bool)), this, SLOT(lockButtonClicked(bool)));
     }
 };

diff --git a/qt/i2pd_qt/widgetlockregistry.h b/qt/i2pd_qt/widgetlockregistry.h
@@ -9,15 +9,19 @@ class widgetlockregistry {
 
 public:
     widgetlockregistry() : locks() {}
-    virtual ~widgetlockregistry() {
+    virtual ~widgetlockregistry() {}
+    void add(widgetlock* lock) {
+        locks.push_back(lock);
+    }
+
+    void deleteListeners() {
         while(!locks.empty()) {
-            delete locks.back();
+            widgetlock* lock = locks.back();
+            lock->deleteListener();
+            delete lock;
             locks.pop_back();
         }
     }
-    void add(widgetlock* lock) {
-        locks.push_back(lock);
-    }
 };
 
 #endif // WIDGETLOCKREGISTRY_H