From bd8eba6913ebfc97220ae9f42362d736f502f474 Mon Sep 17 00:00:00 2001
From: Roland Winklmeier <Roland.M.Winklmeier@gmail.com>
Date: Tue, 2 Sep 2014 21:34:34 +0200
Subject: [PATCH] refs #308 style

---
 src/plugins/simulator/fs9/fs9_client.cpp    |  4 +--
 src/plugins/simulator/fs9/simulator_fs9.cpp | 36 ++++++++++-----------
 2 files changed, 19 insertions(+), 21 deletions(-)

diff --git a/src/plugins/simulator/fs9/fs9_client.cpp b/src/plugins/simulator/fs9/fs9_client.cpp
index 918e3846f..4a768863b 100644
--- a/src/plugins/simulator/fs9/fs9_client.cpp
+++ b/src/plugins/simulator/fs9/fs9_client.cpp
@@ -198,8 +198,6 @@ namespace BlackSimPlugin
 
             if(m_clientStatus == Connected) return hr;
 
-            DPN_APPLICATION_DESC dpAppDesc;
-
             QMutexLocker locker(&m_mutexHostList);
 
             QScopedArrayPointer<wchar_t> wszPlayername(new wchar_t[callsign.size() + 1]);
@@ -227,11 +225,11 @@ namespace BlackSimPlugin
             }
 
             // Now set up the Application Description
+            DPN_APPLICATION_DESC dpAppDesc;
             ZeroMemory(&dpAppDesc, sizeof(DPN_APPLICATION_DESC));
             dpAppDesc.dwSize = sizeof(DPN_APPLICATION_DESC);
             dpAppDesc.guidApplication = CFs9Sdk::guid();
 
-
             // We are now ready to host the app
             if( FAILED( hr = m_directPlayPeer->Connect( &dpAppDesc,    // AppDesc
                                                         m_hostAddress,
diff --git a/src/plugins/simulator/fs9/simulator_fs9.cpp b/src/plugins/simulator/fs9/simulator_fs9.cpp
index 90a8f2d33..7421fc9a7 100644
--- a/src/plugins/simulator/fs9/simulator_fs9.cpp
+++ b/src/plugins/simulator/fs9/simulator_fs9.cpp
@@ -145,23 +145,7 @@ namespace BlackSimPlugin
 
         void CSimulatorFs9::removeRemoteAircraft(const CCallsign &callsign)
         {
-            if(!m_hashFs9Clients.contains(callsign))
-                return;
-
-            CFs9Client *fs9Client = m_hashFs9Clients.value(callsign);
-
-            Q_ASSERT(m_fs9ClientThreads.contains(fs9Client));
-            QThread *fs9ClientThread = m_fs9ClientThreads.value(fs9Client);
-
-            QMetaObject::invokeMethod(fs9Client, "disconnectFrom");
-
-            m_fs9ClientThreads.remove(fs9Client);
-            m_hashFs9Clients.remove(callsign);
-
-            fs9ClientThread->wait(100);
-
-            /*fs9ClientThread->deleteLater();
-            fs9Client->deleteLater();*/
+            ps_removeAircraft(callsign.toQString());
         }
 
         bool CSimulatorFs9::updateOwnSimulatorCockpit(const CAircraft &ownAircraft)
@@ -337,7 +321,23 @@ namespace BlackSimPlugin
 
         void CSimulatorFs9::ps_removeAircraft(const QString &callsign)
         {
-            removeRemoteAircraft(callsign);
+            if(!m_hashFs9Clients.contains(callsign)) return;
+
+            CFs9Client *fs9Client = m_hashFs9Clients.value(callsign);
+
+            Q_ASSERT(m_fs9ClientThreads.contains(fs9Client));
+            QThread *fs9ClientThread = m_fs9ClientThreads.value(fs9Client);
+
+            // Send an async disconnect signal. When finished we will clean up
+            QMetaObject::invokeMethod(fs9Client, "disconnectFrom");
+
+            m_fs9ClientThreads.remove(fs9Client);
+            m_hashFs9Clients.remove(callsign);
+
+            fs9ClientThread->wait(100);
+
+            /*fs9ClientThread->deleteLater();
+            fs9Client->deleteLater();*/
         }
 
         void CSimulatorFs9::updateOwnAircraftFromSim(const CAircraft &ownAircraft)