flightsimulatorplatfrom/pilotclient
1
0
Fork 0
mirror of https://github.com/swift-project/pilotclient.git synced 2026-04-17 10:55:32 +08:00
Code Issues Packages Projects Releases Wiki Activity

Ref T167, improved tryToReconnectWithDBus

Browse Source 
* use exit to abort (close might fail)
* core facade init() now private
* CCoreFacade::getDBusAddress
* display DBusAddress
This commit is contained in:
Klaus Basan
2017-09-29 03:37:10 +02:00
committed by Mathew Sutcliffe
parent 0179e6e757
commit 988a4791ab
3 changed files with 53 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/swiftguistandard/swiftguistd.cpp
View File

@@ -451,19 +451,26 @@ void SwiftGuiStd::displayDBusReconnectDialog()
if (!sGui->getCoreFacade()) { return; }
if (m_displayingDBusReconnect) { return; }
m_displayingDBusReconnect = true;
const QString dBusAddress = sGui->getCoreFacade()->getDBusAddress();
static const QString informativeText("Do you want to try to reconnect? 'Abort' will close the GUI. DBus: '%1'");
QMessageBox msgBox(this);
msgBox.setIcon(QMessageBox::Critical);
msgBox.setText("swift core not reachable.");
msgBox.setInformativeText("Do you want to try to reconnect? 'Abort' will close the GUI.");
msgBox.setText("swift core not reachable!");
msgBox.setInformativeText(informativeText.arg(dBusAddress));
msgBox.setStandardButtons(QMessageBox::Retry | QMessageBox::Abort);
msgBox.setDefaultButton(QMessageBox::Retry);
const int ret = msgBox.exec();
m_displayingDBusReconnect = false;
m_coreFailures = 0;
if (ret == QMessageBox::Abort)
{
this->close();
m_coreFailures = 0;
sGui->gracefulShutdown();
CGuiApplication::exit(EXIT_FAILURE);
return;
}
sGui->getCoreFacade()->tryToReconnectWithDBus();
m_displayingDBusReconnect = false;
CStatusMessage msg = sGui->getCoreFacade()->tryToReconnectWithDBus();
if (msg.isSuccess()) { m_coreFailures = 0; }
msg.clampSeverity(CStatusMessage::SeverityWarning);
CLogMessage::preformatted(msg);
}