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

Some minor tweaks and fixes

Browse Source 
* added names to timers
* Some DBus code formatting
* missing GUI element names
This commit is contained in:
Klaus Basan
2015-04-15 01:15:55 +02:00
parent 4e33cf5ac8
commit a05fa7494f
9 changed files with 23 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/blackcore/context_runtime.cpp
View File

@@ -69,7 +69,7 @@ namespace BlackCore
this->initDBusConnection(dbusAddress);
if (!this->m_dbusConnection.isConnected())
{
QString notConnected("DBus connection failed");
QString notConnected("DBus connection failed:");
QString e = this->m_dbusConnection.lastError().message();
if (!e.isEmpty()) notConnected.append(" ").append(e);
Q_ASSERT_X(false, "CRuntime::init", notConnected.toUtf8().constData());
@@ -311,13 +311,19 @@ namespace BlackCore
void CRuntime::initDBusConnection(const QString &address)
{
if (this->m_initDBusConnection) return;
if (this->m_initDBusConnection) { return; }
if (address.isEmpty() || address == CDBusServer::sessionDBusServer())
{
this->m_dbusConnection = QDBusConnection::sessionBus();
}
else if (address == CDBusServer::systemDBusServer())
{
this->m_dbusConnection = QDBusConnection::sessionBus();
}
else
{
this->m_dbusConnection = QDBusConnection::connectToPeer(address, "BlackBoxRuntime");
}
}
const IContextApplication *CRuntime::getIContextApplication() const