diff options
| author | Johan Klokkhammer Helsing <johan.helsing@theqtcompany.com> | 2016-03-29 16:10:11 +0200 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@theqtcompany.com> | 2016-03-31 09:00:17 +0000 |
| commit | 188e316da118dba62fc72ad4510c1f6ffb9719d6 (patch) | |
| tree | 2a6149ef5d32b6b4cf7478573f7289ac61b6a413 /examples/wayland/qwindow-compositor | |
| parent | 8b89cef7d50325d576fc1206fda840a05b0578fb (diff) | |
qwindow-compositor: Fix regression when clearing popups
Clearing the popup list erroneously got moved inside the foreach loop.
Change-Id: I8696c1c4281207230f5afa3a05d22881d93794c6
Reviewed-by: Erik Larsson <erik@ortogonal.com>
Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@gmail.com>
Diffstat (limited to 'examples/wayland/qwindow-compositor')
| -rw-r--r-- | examples/wayland/qwindow-compositor/windowcompositor.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/examples/wayland/qwindow-compositor/windowcompositor.cpp b/examples/wayland/qwindow-compositor/windowcompositor.cpp index 023474854..9778220c0 100644 --- a/examples/wayland/qwindow-compositor/windowcompositor.cpp +++ b/examples/wayland/qwindow-compositor/windowcompositor.cpp @@ -346,11 +346,10 @@ void WindowCompositor::adjustCursorSurface(QWaylandSurface *surface, int hotspot void WindowCompositor::closePopups() { Q_FOREACH (WindowCompositorView *view, m_popupViews) { - if (view->m_shellSurface) { + if (view->m_shellSurface) view->m_shellSurface->sendPopupDone(); - m_popupViews.clear(); - } } + m_popupViews.clear(); m_xdgShell->closeAllPopups(); } |