Skip to content

Commit a2b3532

Browse files
ut003640deepin-bot[bot]
authored andcommitted
fix: 修复删除VPN后任务栏图标没有变化的问题
删除VPN的时候,会先删除节点,删除节点会先断开信号槽函数的连接,然后才发送VPN状态变化的信号,由于此时信号已经断开,发送的信号无法收到,所以状态没有变化 Log: 修复删除VPN后任务栏图标没有变化的问题 Influence: 从控制中心删除已经连接的VPN,观察任务栏图标中是否还存在VPN图标 Bug: https://pms.uniontech.com/bug-view-341927.html
1 parent 1425771 commit a2b3532

3 files changed

Lines changed: 3 additions & 2 deletions

File tree

net-view/operation/netmanager.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ NetManager::NetManager(NetType::NetManagerFlags flags, QObject *parent)
3333
{
3434
NetItemRegisterMetaType();
3535
connect(d_ptrNetManager.get(), &NetManagerPrivate::request, this, &NetManager::request, Qt::QueuedConnection);
36+
connect(d_ptrNetManager.get(), &NetManagerPrivate::vpnStatusChanged, this, &NetManager::vpnStatusChanged, Qt::QueuedConnection);
3637
d_ptrNetManager->init(flags);
3738
}
3839

net-view/operation/netmanager.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ public Q_SLOTS:
9898
void toControlCenter();
9999
void netCheckAvailableChanged(const bool &netCheckAvailable);
100100
void primaryConnectionTypeChanged(ConnectionType type);
101-
// void vpnStatusChanged();
101+
void vpnStatusChanged();
102102

103103
private:
104104
QScopedPointer<NetManagerPrivate> d_ptrNetManager;

net-view/window/netstatus.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ void NetStatus::onChildAdded(const NetItem *child)
404404
connect(deviceItem, &NetDeviceItem::nameChanged, this, &NetStatus::updateVpnAndProxyStatus);
405405
connect(deviceItem, &NetDeviceItem::enabledableChanged, this, &NetStatus::updateVpnAndProxyStatus);
406406
connect(deviceItem, &NetDeviceItem::enabledChanged, this, &NetStatus::updateVpnAndProxyStatus);
407-
// connect(m_manager, &NetManager::vpnStatusChanged, this, &NetStatus::updateVpnAndProxyStatus);
407+
connect(m_manager, &NetManager::vpnStatusChanged, this, &NetStatus::updateVpnAndProxyStatus);
408408
updateVpnAndProxyStatus();
409409
} break;
410410
case NetType::SystemProxyControlItem: {

0 commit comments

Comments
 (0)