matthew/ostinato
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Gracefully handle portgroup disconnect during Apply

Browse Source 
Fixes #326
This commit is contained in:
Srivats P 2020-12-27 17:00:28 +05:30
parent 33dbc42ecb
commit bcc21ccded
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
client/portgroup.cpp
View File

@ -253,6 +253,16 @@ void PortGroup::on_rpcChannel_disconnected()
emit portListChanged(mPortGroupId); emit portListChanged(mPortGroupId);
emit portGroupDataChanged(mPortGroupId); emit portGroupDataChanged(mPortGroupId);
// Disconnected during apply? Restore UI.
if (applyTimer_.isValid()) {
applyTimer_.invalidate();
emit applyFinished();
mainWindow->setEnabled(true);
QApplication::restoreOverrideCursor();
}
isGetStatsPending_ = false; isGetStatsPending_ = false;
if (reconnect) if (reconnect)
@ -817,6 +827,7 @@ void PortGroup::processApplyBuildAck(int portIndex, PbRpcController *controller)
logInfo(id(), mPorts[portIndex]->id(), logInfo(id(), mPorts[portIndex]->id(),
QString("All port changes applied - in %1s") QString("All port changes applied - in %1s")
.arg(applyTimer_.elapsed()/1e3)); .arg(applyTimer_.elapsed()/1e3));
applyTimer_.invalidate();
if (controller->Failed()) if (controller->Failed())
{ {