Fixed potential crash when opening a new project

embeddedartists · Apr 25, 2014 · a4baeb0 · a4baeb0
1 parent 87fc515
commit a4baeb0
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 10 deletions.
diff --git a/app/generator/uianaloggenerator.cpp b/app/generator/uianaloggenerator.cpp
@@ -81,7 +81,6 @@ void UiAnalogGenerator::handleDeviceChanged()
     // We cannot call removeAllSignals here since we would then delete
     // signals in the active device.
 
-
     QList<QMdiSubWindow*> list = mWinArea->subWindowList();
     foreach(QMdiSubWindow* win, list) {
         closeWindow(win, false);
@@ -197,6 +196,8 @@ void UiAnalogGenerator::closeWindow(QMdiSubWindow* win, bool removeSignal)
 
     AnalogSignal* signal = editWidget->signal();
 
+    editWidget->invalidateSignal();
+
     mWinArea->removeSubWindow(win);
 
     if (removeSignal) {
@@ -205,12 +206,7 @@ void UiAnalogGenerator::closeWindow(QMdiSubWindow* win, bool removeSignal)
 
     // when deleting win the associated widget (editWidget) will also
     // be deleted since win has ownership of editWidget
-    //delete win;
-
-    // 2013-03-28 Commented out the "delete win" line as it causes
-    // segmentation faults when closing the window every time.
-    // Problem does not occur in Linux. On Windows it occurs both for
-    // the device and the simulator.
+    delete win;
 }
 
 /*!

diff --git a/app/generator/uieditanalog.cpp b/app/generator/uieditanalog.cpp
@@ -80,6 +80,18 @@ UiEditAnalog::UiEditAnalog(AnalogSignal *signal, QWidget *parent) :
 */
 
 
+/*!
+    Marks the signal as invalid and disconnects the editor. This is needed
+    to prevent calls to handleNameEdited() after the AnalogSignal has been
+    deleted elsewhere.
+*/
+void UiEditAnalog::invalidateSignal()
+{
+    disconnect(mNameEdit, SIGNAL(editingFinished()),
+               this, SLOT(handleNameEdited()));
+    mSignal = NULL;
+}
+
 /*!
     Creates and returns a box where the analog waveform can be chosen.
     The current waveform is set to \a selected.
@@ -178,10 +190,10 @@ void UiEditAnalog::handleNameEdited()
     QString n = mNameEdit->text();
     if (n.isEmpty() || n.isNull()) {
         n = mSignal->name();
+        mNameEdit->setText(n);
+    } else if (mNameEdit->text() != mSignal->name()) {
+        mSignal->setName(n);
     }
-
-    mSignal->setName(n);
-    mNameEdit->setText(n);
 }
 
 /*!

diff --git a/app/generator/uieditanalog.h b/app/generator/uieditanalog.h
@@ -32,6 +32,7 @@ class UiEditAnalog : public QWidget
     explicit UiEditAnalog(AnalogSignal* signal, QWidget *parent = 0);
 
     AnalogSignal* signal() {return mSignal;}
+    void invalidateSignal();
 
 signals: