Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(network):network equipment cannot be controlled

Browse Source 
网络设备无法控制 bug:20011 20031

(cherry picked from commit dc51e266faa61646a4c2b48f3c02a70f3f0c8eba)
This commit is contained in:
zhaolong 2020-04-17 19:23:44 +08:00 committed by fpc_diesel
parent cb04486718
commit 068b3e028b
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
plugins/network/item/wireditem.cpp
View File

@ -94,12 +94,12 @@ bool WiredItem::deviceActivated()
switch (m_device->status()) {
case NetworkDevice::Unknow:
case NetworkDevice::Unmanaged:
case NetworkDevice::Unavailable:
case NetworkDevice::Disconnected:
case NetworkDevice::Deactivation:
case NetworkDevice::Failed: {
case NetworkDevice::Unavailable: {
return false;
}
case NetworkDevice::Disconnected:
case NetworkDevice::Deactivation:
case NetworkDevice::Failed:
case NetworkDevice::Prepare:
case NetworkDevice::Config:
case NetworkDevice::NeedAuth:
@ -107,7 +107,10 @@ bool WiredItem::deviceActivated()
case NetworkDevice::IpCheck:
case NetworkDevice::Secondaries:
case NetworkDevice::Activated: {
return true;
if (m_device->enabled())
return true;
else
return false;
}
}
}

13
plugins/network/item/wirelessitem.cpp
View File

@ -94,12 +94,12 @@ bool WirelessItem::deviceActivated()
switch (m_device->status()) {
case NetworkDevice::Unknow:
case NetworkDevice::Unmanaged:
case NetworkDevice::Unavailable:
case NetworkDevice::Disconnected:
case NetworkDevice::Deactivation:
case NetworkDevice::Failed: {
case NetworkDevice::Unavailable: {
return false;
}
case NetworkDevice::Disconnected:
case NetworkDevice::Deactivation:
case NetworkDevice::Failed:
case NetworkDevice::Prepare:
case NetworkDevice::Config:
case NetworkDevice::NeedAuth:
@ -107,7 +107,10 @@ bool WirelessItem::deviceActivated()
case NetworkDevice::IpCheck:
case NetworkDevice::Secondaries:
case NetworkDevice::Activated: {
return true;
if (m_device->enabled())
return true;
else
return false;
}
}
}