Don't overwrite current virtual desktop when restarting Xwayland

2 years ago · 993f110d59
parent 71ade59f4b
commit 993f110d59
1 changed files with 5 additions and 3 deletions
--- a/src/workspace.cpp
+++ b/src/workspace.cpp
@ -314,9 +314,11 @@ void Workspace::initializeX11()
 #ifndef QT_NO_SESSIONMANAGER
    sessionRestored = qApp->isSessionRestored();
 #endif
-    if (!sessionRestored) {
-        m_initialDesktop = client_info.currentDesktop();
-        vds->setCurrent(m_initialDesktop);
+    if (!waylandServer()) {
+        if (!sessionRestored) {
+            m_initialDesktop = client_info.currentDesktop();
+            vds->setCurrent(m_initialDesktop);
+        }
    }

    // TODO: better value