gui/scopystatusbar: Managing the destruction of the status bar.

Signed-off-by: andrei.danila <[email protected]>
analogdevicesinc · Mar 21, 2024 · 34bb297 · 34bb297
1 parent 9f8c0f8
commit 34bb297
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/gui/include/gui/widgets/scopystatusbar.h b/gui/include/gui/widgets/scopystatusbar.h
@@ -28,6 +28,7 @@
 #include <QLabel>
 #include <QList>
 #include <QStackedWidget>
+#include <pluginbase/statusbarmanager.h>
 #include "pluginbase/statusmessage.h"
 #include "utils.h"
 #include "menu_anim.hpp"
@@ -40,6 +41,7 @@ class SCOPY_GUI_EXPORT ScopyStatusBar : public MenuVAnim
 	QWIDGET_PAINT_EVENT_HELPER
 public:
 	explicit ScopyStatusBar(QWidget *parent = nullptr);
+	~ScopyStatusBar();
 
 Q_SIGNALS:
 	void requestHistory();
@@ -60,6 +62,7 @@ public Q_SLOTS:
 	// UI elements
 	QStackedWidget *m_stackedWidget;
 	QWidget *m_rightWidget;
+	StatusBarManager *m_statusManager;
 };
 } // namespace scopy
 

diff --git a/gui/src/widgets/scopystatusbar.cpp b/gui/src/widgets/scopystatusbar.cpp
@@ -20,7 +20,6 @@
 
 #include "scopystatusbar.h"
 #include "stylehelper.h"
-#include <pluginbase/statusbarmanager.h>
 #include <QLoggingCategory>
 #include <QApplication>
 #include <QTimer>
@@ -34,10 +33,16 @@ ScopyStatusBar::ScopyStatusBar(QWidget *parent)
 	: MenuVAnim(parent)
 {
 	initUi();
+	m_statusManager = StatusBarManager::GetInstance();
+	connect(m_statusManager, &StatusBarManager::sendStatus, this, &ScopyStatusBar::displayStatusMessage);
+	connect(m_statusManager, &StatusBarManager::clearDisplay, this, &ScopyStatusBar::clearStatusMessage);
+}
 
-	auto statusManager = StatusBarManager::GetInstance();
-	connect(statusManager, &StatusBarManager::sendStatus, this, &ScopyStatusBar::displayStatusMessage);
-	connect(statusManager, &StatusBarManager::clearDisplay, this, &ScopyStatusBar::clearStatusMessage);
+ScopyStatusBar::~ScopyStatusBar()
+{
+	clearStatusMessage();
+	disconnect(m_statusManager, &StatusBarManager::sendStatus, this, &ScopyStatusBar::displayStatusMessage);
+	disconnect(m_statusManager, &StatusBarManager::clearDisplay, this, &ScopyStatusBar::clearStatusMessage);
 }
 
 void ScopyStatusBar::initUi()