Never consider the own device as paused
This commit is contained in:
parent
1cfd067abd
commit
851edeaafc
|
@ -914,6 +914,7 @@ void SyncthingConnection::emitMyIdChanged(const QString &newId)
|
||||||
if (dev.id == newId) {
|
if (dev.id == newId) {
|
||||||
if (dev.status != SyncthingDevStatus::OwnDevice) {
|
if (dev.status != SyncthingDevStatus::OwnDevice) {
|
||||||
dev.status = SyncthingDevStatus::OwnDevice;
|
dev.status = SyncthingDevStatus::OwnDevice;
|
||||||
|
dev.paused = false;
|
||||||
emit devStatusChanged(dev, row);
|
emit devStatusChanged(dev, row);
|
||||||
}
|
}
|
||||||
} else if (dev.status == SyncthingDevStatus::OwnDevice) {
|
} else if (dev.status == SyncthingDevStatus::OwnDevice) {
|
||||||
|
|
|
@ -786,7 +786,7 @@ void SyncthingConnection::readConnections()
|
||||||
dev.status = SyncthingDevStatus::Disconnected;
|
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.totalIncomingTraffic = jsonValueToInt(connectionObj.value(QLatin1String("inBytesTotal")));
|
||||||
dev.totalOutgoingTraffic = jsonValueToInt(connectionObj.value(QLatin1String("outBytesTotal")));
|
dev.totalOutgoingTraffic = jsonValueToInt(connectionObj.value(QLatin1String("outBytesTotal")));
|
||||||
dev.connectionAddress = connectionObj.value(QLatin1String("address")).toString();
|
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
|
// don't mess with the status of the own device
|
||||||
if (devInfo->status != SyncthingDevStatus::OwnDevice) {
|
if (devInfo->status != SyncthingDevStatus::OwnDevice) {
|
||||||
devInfo->status = status;
|
devInfo->status = status;
|
||||||
|
devInfo->paused = paused;
|
||||||
}
|
}
|
||||||
devInfo->paused = paused;
|
|
||||||
emit devStatusChanged(*devInfo, index);
|
emit devStatusChanged(*devInfo, index);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue