From 3103359cd6898fe219af5a1c0c421d1dc20fc54e Mon Sep 17 00:00:00 2001
From: itsmattkc <itsmattkc@gmail.com>
Date: Fri, 18 Sep 2020 23:49:40 +1000
Subject: [PATCH] slider: fixed crash when clicking another mouse button while
 dragging

---
 app/widget/slider/sliderlabel.cpp  | 10 ++++++----
 app/widget/slider/sliderladder.cpp | 13 ++++++++++---
 app/widget/slider/sliderladder.h   |  2 ++
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/app/widget/slider/sliderlabel.cpp b/app/widget/slider/sliderlabel.cpp
index d100379a5..ffc07fb2c 100644
--- a/app/widget/slider/sliderlabel.cpp
+++ b/app/widget/slider/sliderlabel.cpp
@@ -51,10 +51,12 @@ SliderLabel::SliderLabel(QWidget *parent) :
 
 void SliderLabel::mousePressEvent(QMouseEvent *e)
 {
-  if (e->modifiers() & Qt::AltModifier) {
-    emit RequestReset();
-  } else {
-    emit LabelPressed();
+  if (e->button() == Qt::LeftButton) {
+    if (e->modifiers() & Qt::AltModifier) {
+      emit RequestReset();
+    } else {
+      emit LabelPressed();
+    }
   }
 }
 
diff --git a/app/widget/slider/sliderladder.cpp b/app/widget/slider/sliderladder.cpp
index 5a9c4d235..c5c0054ae 100644
--- a/app/widget/slider/sliderladder.cpp
+++ b/app/widget/slider/sliderladder.cpp
@@ -103,9 +103,7 @@ void SliderLadder::mouseReleaseEvent(QMouseEvent *event)
 {
   Q_UNUSED(event)
 
-  drag_timer_.stop();
-
-  emit Released();
+  this->close();
 }
 
 void SliderLadder::showEvent(QShowEvent *event)
@@ -115,6 +113,15 @@ void SliderLadder::showEvent(QShowEvent *event)
   drag_timer_.start();
 }
 
+void SliderLadder::closeEvent(QCloseEvent *event)
+{
+  Q_UNUSED(event)
+
+  drag_timer_.stop();
+
+  emit Released();
+}
+
 void SliderLadder::TimerUpdate()
 {
   int32_t x_mvmt, y_mvmt;
diff --git a/app/widget/slider/sliderladder.h b/app/widget/slider/sliderladder.h
index ce0ae6193..9fc30e511 100644
--- a/app/widget/slider/sliderladder.h
+++ b/app/widget/slider/sliderladder.h
@@ -75,6 +75,8 @@ protected:
 
   virtual void showEvent(QShowEvent *event) override;
 
+  virtual void closeEvent(QCloseEvent* event) override;
+
 signals:
   void DraggedByValue(int value, double multiplier);