From 8153aa7d40ddf15eb5aaf4798a7c6c5014ebee63 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Sat, 12 Oct 2019 11:17:40 +0200
Subject: [PATCH] fixed #1362 rightclick on empty split crash

---
 src/widgets/splits/SplitHeader.cpp | 8 ++++----
 src/widgets/splits/SplitHeader.hpp | 1 -
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/widgets/splits/SplitHeader.cpp b/src/widgets/splits/SplitHeader.cpp
index 8839708dd..5ba700d87 100644
--- a/src/widgets/splits/SplitHeader.cpp
+++ b/src/widgets/splits/SplitHeader.cpp
@@ -213,9 +213,7 @@ void SplitHeader::initializeLayout()
         this->dropdownButton_ = makeWidget<Button>([&](auto w) {
             /// XXX: this never gets disconnected
             this->split_->channelChanged.connect([this] {
-                auto menu = this->createMainMenu();
-                this->mainMenu_ = menu.get();
-                this->dropdownButton_->setMenu(std::move(menu));
+                this->dropdownButton_->setMenu(this->createMainMenu());
             });
         }),
         // add split
@@ -598,7 +596,9 @@ void SplitHeader::mousePressEvent(QMouseEvent *event)
         break;
 
         case Qt::RightButton: {
-            this->mainMenu_->popup(this->mapToGlobal(event->pos()));
+            auto menu = this->createMainMenu().release();
+            menu->setAttribute(Qt::WA_DeleteOnClose);
+            menu->popup(this->mapToGlobal(event->pos() + QPoint(0, 4)));
         }
         break;
     }
diff --git a/src/widgets/splits/SplitHeader.hpp b/src/widgets/splits/SplitHeader.hpp
index 7f45ceedd..fb58833ee 100644
--- a/src/widgets/splits/SplitHeader.hpp
+++ b/src/widgets/splits/SplitHeader.hpp
@@ -55,7 +55,6 @@ private:
 
     // ui
     Button *dropdownButton_{};
-    QMenu *mainMenu_{};
     Label *titleLabel_{};
     EffectLabel *modeButton_{};
     Button *moderationButton_{};