[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [plasma-workspace/Plasma/5.9] applets/appmenu/lib: [Appmenu Applet] Check whether buttonGrid has a w
From:       Kai Uwe Broulik <null () kde ! org>
Date:       2017-01-31 16:09:18
Message-ID: E1cYaze-0003yB-1c () code ! kde ! org
[Download RAW message or body]

Git commit 637fac160057ad7df62ac1688c7c6491037df575 by Kai Uwe Broulik.
Committed on 31/01/2017 at 16:07.
Pushed by broulik into branch 'Plasma/5.9'.

[Appmenu Applet] Check whether buttonGrid has a window before calling mapToGlobal

It can happen this isn't the case after moving panels around and then playing around
with the menu button.

M  +1    -1    applets/appmenu/lib/appmenuapplet.cpp

https://commits.kde.org/plasma-workspace/637fac160057ad7df62ac1688c7c6491037df575

diff --git a/applets/appmenu/lib/appmenuapplet.cpp b/applets/appmenu/lib/appmenuapplet.cpp
index 85b28295..444893fc 100644
--- a/applets/appmenu/lib/appmenuapplet.cpp
+++ b/applets/appmenu/lib/appmenuapplet.cpp
@@ -228,7 +228,7 @@ bool AppMenuApplet::eventFilter(QObject *watched, QEvent *event)
     } else if (event->type() == QEvent::MouseMove) {
         auto *e = static_cast<QMouseEvent *>(event);
 
-        if (!m_buttonGrid) {
+        if (!m_buttonGrid || !m_buttonGrid->window()) {
             return false;
         }
 
[prev in list] [next in list] [prev in thread] [next in thread]