From 89fb2c7ce76ad10681ed4d94177e4941b54aa496 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Sun, 13 May 2012 18:03:47 +0300 Subject: Call set_toplevel properly to fix apps on weston MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Due to a misplaced else branch set_toplevel was not called at all. This resulted in not setting up the surface properly in Weston (no output was assigned), leading to not sending any frame callbacks to the apps which then got to wait forever in waitForFrameSync(). Change-Id: I37d7b53a8cca59be71fe358543a488382cb0d4dd Reviewed-by: Samuel Rødal --- src/plugins/platforms/wayland/qwaylandwindow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/plugins/platforms/wayland/qwaylandwindow.cpp') diff --git a/src/plugins/platforms/wayland/qwaylandwindow.cpp b/src/plugins/platforms/wayland/qwaylandwindow.cpp index 5635322f0..fffdd524a 100644 --- a/src/plugins/platforms/wayland/qwaylandwindow.cpp +++ b/src/plugins/platforms/wayland/qwaylandwindow.cpp @@ -94,12 +94,12 @@ QWaylandWindow::QWaylandWindow(QWindow *window) if (parent() && mSubSurfaceWindow) { mSubSurfaceWindow->setParent(static_cast(parent())); - }else if (window->transientParent()) { + } else if (window->transientParent()) { if (window->transientParent()) { mShellSurface->updateTransientParent(window->transientParent()); - } else { - mShellSurface->setTopLevel(); } + } else { + mShellSurface->setTopLevel(); } setWindowFlags(window->windowFlags()); -- cgit v1.2.3