From 93d22ec6fc21f6501aabc2fd47beb78cc2503e07 Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Tue, 12 Mar 2013 12:19:55 +0100
Subject: [PATCH] [Fix] Don't show instant popup when clicking on back/forward
 button.

---
 CHANGELOG                    | 4 ++++
 src/lib/tools/toolbutton.cpp | 9 ++++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index bfaea5e34..f8401150b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+Version 1.4.1
+    * not yet released
+    * fixed instantly showing popup when clicking on back/forward button
+
 Version 1.4.0
     * released 11 March 2013
     * highlighting host in address in locationbar
diff --git a/src/lib/tools/toolbutton.cpp b/src/lib/tools/toolbutton.cpp
index a7a4e3d2e..621a7a39b 100644
--- a/src/lib/tools/toolbutton.cpp
+++ b/src/lib/tools/toolbutton.cpp
@@ -92,12 +92,19 @@ void ToolButton::setMultiIcon(const QPixmap &image)
 
 void ToolButton::mousePressEvent(QMouseEvent* e)
 {
-    if (e->button() != Qt::MiddleButton && menu()) {
+    if (e->button() == Qt::LeftButton && menu() && popupMode() == QToolButton::InstantPopup) {
         setDown(true);
         showMenu();
         return;
     }
 
+    if (e->button() == Qt::RightButton && menu()) {
+        setDown(true);
+        showMenu();
+        return;
+    }
+
+
     if (e->button() == Qt::MiddleButton) {
         setDown(true);
     }