summaryrefslogtreecommitdiffstats
path: root/src/plugins/platforms/wayland/qwaylandwindow.cpp
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.p.agocs@nokia.com>2012-05-13 18:03:47 +0300
committerLaszlo Agocs <laszlo.p.agocs@nokia.com>2012-05-15 07:13:03 +0200
commit89fb2c7ce76ad10681ed4d94177e4941b54aa496 (patch)
tree87c4f12c1f7c2e499000b3b698ffc10c1d3a1d4a /src/plugins/platforms/wayland/qwaylandwindow.cpp
parent7e44394c478acee72327a5aa1e5e5a3c70fd8764 (diff)
Call set_toplevel properly to fix apps on weston
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 <samuel.rodal@nokia.com>
Diffstat (limited to 'src/plugins/platforms/wayland/qwaylandwindow.cpp')
-rw-r--r--src/plugins/platforms/wayland/qwaylandwindow.cpp6
1 files changed, 3 insertions, 3 deletions
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<const QWaylandWindow *>(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());