Make xdg-shell usage check better

desktop-app · Jun 20, 2021 · 7fadd9f · 7fadd9f
1 parent bcb2d61
commit 7fadd9f
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 12 deletions.
diff --git a/waylandshells/xdg-shell/main.cpp b/waylandshells/xdg-shell/main.cpp
@@ -47,16 +47,6 @@ namespace WaylandShells {
 
 using namespace QtWaylandClient;
 
-namespace {
-
-bool InUse = false;
-
-}
-
-bool XdgShell() {
-    return InUse;
-}
-
 class DesktopAppWaylandXdgShellIntegrationPlugin : public QWaylandShellIntegrationPlugin
 {
     Q_OBJECT
@@ -70,7 +60,6 @@ QWaylandShellIntegration *DesktopAppWaylandXdgShellIntegrationPlugin::create(con
 {
     Q_UNUSED(key);
     Q_UNUSED(paramList);
-    InUse = true;
     return new QWaylandXdgShellIntegration();
 }
 

diff --git a/waylandshells/xdg-shell/qwaylandxdgshellintegration.cpp b/waylandshells/xdg-shell/qwaylandxdgshellintegration.cpp
@@ -49,8 +49,20 @@ namespace WaylandShells {
 
 using namespace QtWaylandClient;
 
+namespace {
+
+bool InUse = false;
+
+}
+
+bool XdgShell() {
+    return InUse;
+}
+
 bool QWaylandXdgShellIntegration::initialize(QWaylandDisplay *display)
 {
+    InUse = false;
+
     for (QWaylandDisplay::RegistryGlobal global : display->globals()) {
         if (global.interface == QLatin1String("xdg_wm_base")) {
             m_xdgShell.reset(new QWaylandXdgShell(display, global.id, global.version));
@@ -63,7 +75,8 @@ bool QWaylandXdgShellIntegration::initialize(QWaylandDisplay *display)
         return false;
     }
 
-    return QWaylandShellIntegration::initialize(display);
+    InUse = QWaylandShellIntegration::initialize(display);
+    return InUse;
 }
 
 QWaylandShellSurface *QWaylandXdgShellIntegration::createShellSurface(QWaylandWindow *window)