From 741843d0c6fcbca6c6eaba639fc5538aa96aec46 Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Sun, 11 Aug 2019 02:23:18 +0200 Subject: [PATCH] Make sure listener does NOT restart when settings are updated, but DBus address did not change (set member correctly) --- .../simulation/xplane/xswiftbusconfigwriter.cpp | 6 +++--- src/plugins/simulator/xplane/simulatorxplane.cpp | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/blackmisc/simulation/xplane/xswiftbusconfigwriter.cpp b/src/blackmisc/simulation/xplane/xswiftbusconfigwriter.cpp index 330f73dee..41b6c6bd2 100644 --- a/src/blackmisc/simulation/xplane/xswiftbusconfigwriter.cpp +++ b/src/blackmisc/simulation/xplane/xswiftbusconfigwriter.cpp @@ -45,19 +45,19 @@ namespace BlackMisc void CXSwiftBusConfigWriter::updateInXPlane9() { - QString path = CXPlaneUtil::xswiftbusPluginDir(CXPlaneUtil::xplane9Dir()); + const QString path = CXPlaneUtil::xswiftbusPluginDir(CXPlaneUtil::xplane9Dir()); if (!path.isEmpty()) { writeTo(path); } } void CXSwiftBusConfigWriter::updateInXPlane10() { - QString path = CXPlaneUtil::xswiftbusPluginDir(CXPlaneUtil::xplane10Dir()); + const QString path = CXPlaneUtil::xswiftbusPluginDir(CXPlaneUtil::xplane10Dir()); if (!path.isEmpty()) { writeTo(path); } } void CXSwiftBusConfigWriter::updateInXPlane11() { - QString path = CXPlaneUtil::xswiftbusPluginDir(CXPlaneUtil::xplane11Dir()); + const QString path = CXPlaneUtil::xswiftbusPluginDir(CXPlaneUtil::xplane11Dir()); if (!path.isEmpty()) { writeTo(path); } } diff --git a/src/plugins/simulator/xplane/simulatorxplane.cpp b/src/plugins/simulator/xplane/simulatorxplane.cpp index 228b21f39..ae6b612a2 100644 --- a/src/plugins/simulator/xplane/simulatorxplane.cpp +++ b/src/plugins/simulator/xplane/simulatorxplane.cpp @@ -1302,14 +1302,14 @@ namespace BlackSimPlugin if (this->isShuttingDown()) { return; } Q_ASSERT_X(!CThreadUtils::isCurrentThreadApplicationThread(), Q_FUNC_INFO, "Expect to run in background"); - const QString dbusAddress = m_xSwiftBusServerSettings.getThreadLocal().getDBusServerAddressQt(); - if (CDBusServer::isSessionOrSystemAddress(dbusAddress)) + m_dBusServerAddress = m_xSwiftBusServerSettings.getThreadLocal().getDBusServerAddressQt(); + 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); } }