From bab66017f5a8a8da2d7414fb26249dfe8d18f3c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E6=9C=8B=E7=A8=8B?= <fanpengcheng_cm@deepin.com>
Date: Fri, 19 Jun 2020 20:58:43 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E6=A0=8F=E5=87=BA=E7=8E=B0=E5=A4=9A=E4=B8=AA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

任务栏使用了DApplication::setSingleInstance函数来限制单实例运行，但此函数有问题，
dtkgui库提供了setSingelInstanceInterval来设置等待间隔，-1表示永远等待，
注意：依赖dtkgui>5.2.0.1

Log: 修复桌面出现多个任务栏的问题
Bug: https://pms.uniontech.com/zentao/bug-view-33650.html
Bug: https://pms.uniontech.com/zentao/bug-view-32857.html
---
 frame/main.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frame/main.cpp b/frame/main.cpp
index 328f05720..4838bd0ee 100644
--- a/frame/main.cpp
+++ b/frame/main.cpp
@@ -100,6 +100,7 @@ int main(int argc, char *argv[])
     parser.addOption(disablePlugOption);
     parser.process(app);
 
+    DGuiApplicationHelper::setSingelInstanceInterval(-1);
     if (!app.setSingleInstance(QString("dde-dock_%1").arg(getuid()))) {
         qDebug() << "set single instance failed!";
         return -1;