From 328fba76b4780e1f8614584e93cd1bdc49255082 Mon Sep 17 00:00:00 2001
From: Malte Langermann <54738901+gagarinlg@users.noreply.github.com>
Date: Wed, 23 Nov 2022 07:04:01 +0100
Subject: [PATCH] fix(ui): Superfluous and invalid attribute initialisation
 (#2747)

* fix(ui): fixed a memopry leak and a waring in topbar.cpp
* fix: Restore ScreenMenu on exit of topbar widget setup
---
 radio/src/gui/colorlcd/topbar.cpp | 3 +--
 radio/src/gui/colorlcd/topbar.h   | 3 ---
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/radio/src/gui/colorlcd/topbar.cpp b/radio/src/gui/colorlcd/topbar.cpp
index 3566397f6..c61592aa3 100644
--- a/radio/src/gui/colorlcd/topbar.cpp
+++ b/radio/src/gui/colorlcd/topbar.cpp
@@ -35,8 +35,7 @@ Topbar * TopbarFactory::create(Window * parent)
 }
 
 SetupTopBarWidgetsPage::SetupTopBarWidgetsPage():
-  FormWindow(ViewMain::instance(), rect_t{}, FORM_FORWARD_FOCUS),
-  menu(menu)
+  FormWindow(ViewMain::instance(), rect_t{}, FORM_FORWARD_FOCUS)
 {
   // remember focus
   Layer::push(this);
diff --git a/radio/src/gui/colorlcd/topbar.h b/radio/src/gui/colorlcd/topbar.h
index e0fdcf780..85c864643 100644
--- a/radio/src/gui/colorlcd/topbar.h
+++ b/radio/src/gui/colorlcd/topbar.h
@@ -54,7 +54,4 @@ class SetupTopBarWidgetsPage : public FormWindow
   void onClicked() override;
   void onCancel() override;
   void deleteLater(bool detach = true, bool trash = true) override;
-
- protected:
-  ScreenMenu* menu;
 };