Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Never consider the own device as paused

This commit is contained in:
Martchus 2021-02-12 12:51:18 +01:00
parent 1cfd067abd
commit 851edeaafc
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
connector/syncthingconnection.cpp
View File

@ -914,6 +914,7 @@ void SyncthingConnection::emitMyIdChanged(const QString &newId)
if (dev.id == newId) {
if (dev.status != SyncthingDevStatus::OwnDevice) {
dev.status = SyncthingDevStatus::OwnDevice;
dev.paused = false;
emit devStatusChanged(dev, row);
}
} else if (dev.status == SyncthingDevStatus::OwnDevice) {

4
connector/syncthingconnection_requests.cpp
View File

@ -786,7 +786,7 @@ void SyncthingConnection::readConnections()
dev.status = SyncthingDevStatus::Disconnected;
}
}
dev.paused = connectionObj.value(QLatin1String("paused")).toBool(false);
dev.paused = dev.status == SyncthingDevStatus::OwnDevice ? false : connectionObj.value(QLatin1String("paused")).toBool(false);
dev.totalIncomingTraffic = jsonValueToInt(connectionObj.value(QLatin1String("inBytesTotal")));
dev.totalOutgoingTraffic = jsonValueToInt(connectionObj.value(QLatin1String("outBytesTotal")));
dev.connectionAddress = connectionObj.value(QLatin1String("address")).toString();
@ -1852,8 +1852,8 @@ void SyncthingConnection::readDeviceEvent(DateTime eventTime, const QString &eve
// don't mess with the status of the own device
if (devInfo->status != SyncthingDevStatus::OwnDevice) {
devInfo->status = status;
devInfo->paused = paused;
}
devInfo->paused = paused;
emit devStatusChanged(*devInfo, index);
}
}