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

Make sure listener does NOT restart when settings are updated, but DBus address did not change (set member correctly)

Browse Source
This commit is contained in:
Klaus Basan
2019-08-11 02:23:18 +02:00
committed by Mat Sutcliffe
parent 4830bbc646
commit d5b1eab55a
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/blackmisc/simulation/xplane/xswiftbusconfigwriter.cpp
View File

@@ -45,19 +45,19 @@ namespace BlackMisc
void CXSwiftBusConfigWriter::updateInXPlane9() void CXSwiftBusConfigWriter::updateInXPlane9()
{ {
QString path = CXPlaneUtil::xswiftbusPluginDir(CXPlaneUtil::xplane9Dir()); const QString path = CXPlaneUtil::xswiftbusPluginDir(CXPlaneUtil::xplane9Dir());
if (!path.isEmpty()) { writeTo(path); } if (!path.isEmpty()) { writeTo(path); }
} }
void CXSwiftBusConfigWriter::updateInXPlane10() void CXSwiftBusConfigWriter::updateInXPlane10()
{ {
QString path = CXPlaneUtil::xswiftbusPluginDir(CXPlaneUtil::xplane10Dir()); const QString path = CXPlaneUtil::xswiftbusPluginDir(CXPlaneUtil::xplane10Dir());
if (!path.isEmpty()) { writeTo(path); } if (!path.isEmpty()) { writeTo(path); }
} }
void CXSwiftBusConfigWriter::updateInXPlane11() void CXSwiftBusConfigWriter::updateInXPlane11()
{ {
QString path = CXPlaneUtil::xswiftbusPluginDir(CXPlaneUtil::xplane11Dir()); const QString path = CXPlaneUtil::xswiftbusPluginDir(CXPlaneUtil::xplane11Dir());
if (!path.isEmpty()) { writeTo(path); } if (!path.isEmpty()) { writeTo(path); }
} }

10
src/plugins/simulator/xplane/simulatorxplane.cpp
View File

@@ -1302,14 +1302,14 @@ namespace BlackSimPlugin
if (this->isShuttingDown()) { return; } if (this->isShuttingDown()) { return; }
Q_ASSERT_X(!CThreadUtils::isCurrentThreadApplicationThread(), Q_FUNC_INFO, "Expect to run in background"); Q_ASSERT_X(!CThreadUtils::isCurrentThreadApplicationThread(), Q_FUNC_INFO, "Expect to run in background");
const QString dbusAddress = m_xSwiftBusServerSettings.getThreadLocal().getDBusServerAddressQt(); m_dBusServerAddress = m_xSwiftBusServerSettings.getThreadLocal().getDBusServerAddressQt();
if (CDBusServer::isSessionOrSystemAddress(dbusAddress)) if (CDBusServer::isSessionOrSystemAddress(m_dBusServerAddress))
{ {
checkConnectionViaBus(dbusAddress); checkConnectionViaBus(m_dBusServerAddress);
} }
else if (CDBusServer::isQtDBusAddress(dbusAddress)) else if (CDBusServer::isQtDBusAddress(m_dBusServerAddress))
{ {
checkConnectionViaPeer(dbusAddress); checkConnectionViaPeer(m_dBusServerAddress);
} }
} }