From 1c57108dc170c03515b193a590b5d7fa97129a8c Mon Sep 17 00:00:00 2001
From: wubowen <wubowen@uniontech.com>
Date: Fri, 26 Aug 2022 14:20:09 +0800
Subject: [PATCH] fix: update daemonDockInterface when the dde-daemon dock
 interface init after dde-dock
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

当dock比dde-daemon的dockInterface启动更早，dock会delete该interface指针后重新new
但是在menuworker里面，还是使用的未更新的dockInterface对象，即野指针
因此会导致调用接口后崩溃

Log: Update daemonDockInterface when daemon init behind dock
Influence: 注销右键点击出现菜单栏
Bug: https://pms.uniontech.com/bug-view-155357.html
Change-Id: I666c3e66f3bfbdbd66c230d8d5ea72175b355289
---
 frame/util/menuworker.cpp        | 5 +++++
 frame/util/menuworker.h          | 1 +
 frame/util/multiscreenworker.cpp | 1 +
 frame/util/multiscreenworker.h   | 1 +
 frame/window/mainwindow.cpp      | 4 ++++
 5 files changed, 12 insertions(+)

diff --git a/frame/util/menuworker.cpp b/frame/util/menuworker.cpp
index 4c797c7ed..337d5542a 100644
--- a/frame/util/menuworker.cpp
+++ b/frame/util/menuworker.cpp
@@ -196,3 +196,8 @@ void MenuWorker::setAutoHide(const bool autoHide)
     m_autoHide = autoHide;
     emit autoHideChanged(m_autoHide);
 }
+
+void MenuWorker::onNotifyDaemonInterfaceUpdate(DBusDock *dockInter)
+{
+    m_dockInter = dockInter;
+}
diff --git a/frame/util/menuworker.h b/frame/util/menuworker.h
index c7501586e..9d09969ca 100644
--- a/frame/util/menuworker.h
+++ b/frame/util/menuworker.h
@@ -45,6 +45,7 @@ signals:
 
 public slots:
     void setAutoHide(const bool autoHide);
+    void onNotifyDaemonInterfaceUpdate(DBusDock *dockInter);
 
 private:
     QMenu *createMenu(QMenu *settingsMenu);
diff --git a/frame/util/multiscreenworker.cpp b/frame/util/multiscreenworker.cpp
index b17fd77d3..3fe8c233c 100644
--- a/frame/util/multiscreenworker.cpp
+++ b/frame/util/multiscreenworker.cpp
@@ -1371,6 +1371,7 @@ void MultiScreenWorker::checkDaemonDockService()
                 FREE_POINT(m_dockInter);
 
                 m_dockInter = new DBusDock(serverName, "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this);
+                Q_EMIT notifyDaemonInterfaceUpdate();
                 // connect
                 connectionInit(m_dockInter);
 
diff --git a/frame/util/multiscreenworker.h b/frame/util/multiscreenworker.h
index aa8ac7582..9070999f3 100644
--- a/frame/util/multiscreenworker.h
+++ b/frame/util/multiscreenworker.h
@@ -169,6 +169,7 @@ signals:
     void requestStopHideAni();
 
     void requestUpdateDockEntry();
+    void notifyDaemonInterfaceUpdate();
 
 public slots:
     void onAutoHideChanged(bool autoHide);
diff --git a/frame/window/mainwindow.cpp b/frame/window/mainwindow.cpp
index c08c92ada..8212554bb 100755
--- a/frame/window/mainwindow.cpp
+++ b/frame/window/mainwindow.cpp
@@ -378,6 +378,10 @@ void MainWindow::initConnections()
     // 响应后端触控屏拖拽任务栏高度长按信号
     connect(TouchSignalManager::instance(), &TouchSignalManager::middleTouchPress, this, &MainWindow::touchRequestResizeDock);
     connect(TouchSignalManager::instance(), &TouchSignalManager::touchMove, m_dragWidget, &DragWidget::onTouchMove);
+
+    connect(m_multiScreenWorker, &MultiScreenWorker::notifyDaemonInterfaceUpdate, m_menuWorker, [this]() {
+        m_menuWorker->onNotifyDaemonInterfaceUpdate(m_multiScreenWorker->dockInter());
+    });
 }
 
 /**