modify dialog call, prevent memory leak

Qucs · Sep 9, 2016 · 93e1536 · 93e1536
1 parent b5aceda
commit 93e1536
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/qucs/qucs/dialogs/qucssettingsdialog.cpp b/qucs/qucs/dialogs/qucssettingsdialog.cpp
@@ -433,6 +433,7 @@ QucsSettingsDialog::QucsSettingsDialog(QucsApp *parent)
     ascoEdit->setText(QucsSettings.AscoBinDir.canonicalPath());
     octaveEdit->setText(QucsSettings.OctaveBinDir.canonicalPath());
 
+    shortcutDialog = NULL;
 
     resize(300, 200);
 }
@@ -699,8 +700,10 @@ void QucsSettingsDialog::slotBGColorDialog()
 // -----------------------------------------------------------
 void QucsSettingsDialog::slotShortcutDialog()
 {
-  QucsShortcutDialog *d = new QucsShortcutDialog(App);
-  d->exec();
+  if (!shortcutDialog) {
+    shortcutDialog = new QucsShortcutDialog(App);
+  }
+  shortcutDialog->exec();
 }
 
 // -----------------------------------------------------------

diff --git a/qucs/qucs/dialogs/qucssettingsdialog.h b/qucs/qucs/dialogs/qucssettingsdialog.h
@@ -27,6 +27,8 @@
 #include <QRegExp>
 #include <QVBoxLayout>
 
+class QucsShortcutDialog;
+
 class QLineEdit;
 class QCheckBox;
 class QVBoxLayout;
@@ -98,6 +100,7 @@ private slots:
     QRegExp Expr;
     QRegExpValidator *Validator;
 
+    QucsShortcutDialog *shortcutDialog;
 private:
     QStringList currentPaths;