Fixed bug in waveform viewer, make sure that deleting a controller causes closing the tab

Author: joern274

CHANGELOG.md

@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 * added information to GUI setting file so that widgets position and size from previous session gets restored
 * added option to focus on pin in pin context menu
 * plugins
+  * fixed bug in waveform viewer, make sure that deleting a controller causes closing the tab
   * fixed broken initialization of DANA plugin when starting via CLI
   * changed behavior of GUI plugin manager to keep only those plugins loaded which are requested by user
   * fixed bug in the bitorder propagation algorithm that would assign a wrong propagation order if pingroups with direction none were given as parameters

plugins/simulator/waveform_viewer/include/waveform_viewer/wave_widget.h

@@ -32,6 +32,7 @@
 #include <QMap>
 #include <QSplitter>
 #include <QFrame>
+#include <QPointer>
 
 #include <hal_core/defines.h>
 #include "waveform_viewer/wave_item.h"
@@ -88,7 +89,7 @@ namespace hal {
         void resizeEvent(QResizeEvent *event) override;
 
     private:
-        NetlistSimulatorController* mController;
+        QPointer<NetlistSimulatorController> mController;
         std::unique_ptr<NetlistSimulatorController> mControllerOwner;
 
         u32 mControllerId;

plugins/simulator/waveform_viewer/src/wave_widget.cpp

@@ -175,7 +175,8 @@ namespace hal {
 
     void WaveWidget::createEngine(const QString &engineFactoryName)
     {
-        mController->create_simulation_engine(engineFactoryName.toStdString());
+        if (mController)
+            mController->create_simulation_engine(engineFactoryName.toStdString());
     }
 
     void WaveWidget::setVisualizeNetState(bool state, bool activeTab)

plugins/simulator/waveform_viewer/src/waveform_viewer.cpp

@@ -361,7 +361,7 @@ namespace hal
         for (int inx=0; inx<mTabWidget->count(); inx++)
         {
             WaveWidget* ww = static_cast<WaveWidget*>(mTabWidget->widget(inx));
-            if (ww->controllerId() == controllerId)
+            if (ww->controllerId() == controllerId || ww->controllerId() == 0)
             {
                 mTabWidget->removeTab(inx);
                 ww->deleteLater();