fix: Stuck in dbus data acquisition

log: as title
linuxdeepin · Sep 2, 2024 · 70a2ea3 · 70a2ea3
1 parent 40f08ae
commit 70a2ea3
Showing 1 changed file with 22 additions and 3 deletions.
diff --git a/panels/dock/clipboarditem/clipboarditem.cpp b/panels/dock/clipboarditem/clipboarditem.cpp
@@ -13,6 +13,8 @@
 
 #include <QGuiApplication>
 #include <QBuffer>
+#include <QDBusServiceWatcher>
+#include <QDBusConnectionInterface>
 
 DGUI_USE_NAMESPACE
 
@@ -29,17 +31,34 @@ static DDBusSender clipboardDbus()
         .interface(clipboardInterface);
 }
 
+static  QDBusServiceWatcher dbusWatcher(clipboardService, QDBusConnection::sessionBus(),
+                                                QDBusServiceWatcher::WatchForOwnerChange);
+
 ClipboardItem::ClipboardItem(QObject *parent)
     : DApplet(parent)
     , m_visible(true)
     , m_clipboardVisible(false)
 {
     QDBusConnection::sessionBus().connect(clipboardService, clipboardPath, clipboardInterface,
                                           "clipboardVisibleChanged", this, SLOT(onClipboardVisibleChanged(bool)));
-    QDBusInterface clipboardInter(clipboardService, clipboardPath, clipboardInterface, QDBusConnection::sessionBus());
-    if (clipboardInter.isValid()) {
-        m_clipboardVisible = clipboardInter.property("clipboardVisible").toBool();
+
+    auto func = [this](){
+        QDBusInterface clipboardInter(clipboardService, clipboardPath, clipboardInterface, QDBusConnection::sessionBus());
+        if (clipboardInter.isValid()) {
+            m_clipboardVisible = clipboardInter.property("clipboardVisible").toBool();
+        }
+    };
+    if (QDBusConnection::sessionBus().interface()->isServiceRegistered(clipboardService)) {
+        func();
     }
+
+    connect(&dbusWatcher, &QDBusServiceWatcher::serviceRegistered, this, [this, func](){
+        func();
+    });
+
+    connect(&dbusWatcher, &QDBusServiceWatcher::serviceUnregistered, this, [this](){
+        m_clipboardVisible = false;
+    });
 }
 
 void ClipboardItem::toggleClipboard()