Refactor: Minor Fixes

TwinFan · Dec 16, 2023 · 6383cec · 6383cec
1 parent f086387
commit 6383cec
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/Lib/XPMP2 b/Lib/XPMP2
diff --git a/Src/ACTable.cpp b/Src/ACTable.cpp
@@ -475,7 +475,7 @@ bool ACTable::UpdateFDIs (const std::string& _filter)
     std::vector<FDInfo> vecAgain;
     for (const mapLTFlightDataTy::value_type& p: mapFd) {
         // First filter: Visible a/c only?
-        if (bFilterAcOnly && !p.second.hasAc())
+        if (bFilterAcOnly && (!p.second.hasAc() || !p.second.GetAircraft()->IsVisible()))
             continue;
         // others: test if filter matches
         FDInfo fdi(p.second);

diff --git a/Src/InfoListWnd.cpp b/Src/InfoListWnd.cpp
@@ -135,7 +135,7 @@ void InfoListWnd::buildInterface()
             TabActive(ILW_TAB_AC_LIST);
 
             // Limit to visible planes only
-            ImGui::Checkbox("Only displayed a/c", &acList.bFilterAcOnly);
+            ImGui::Checkbox("Only visible a/c", &acList.bFilterAcOnly);
 
             // Search a setting
             // If there is a search text then the tree nodes will be suppressed,

diff --git a/Src/LTChannel.cpp b/Src/LTChannel.cpp
@@ -920,7 +920,6 @@ void LTFlightDataAcMaintenance()
         {
             // access guarded by a mutex
             LTFlightData& fd = i->second;
-            std::lock_guard<std::recursive_mutex> lockFd (fd.dataAccessMutex);
             // do the maintenance, remove aircraft if that's the verdict
             if ( fd.AircraftMaintenance(simTime) )
                 i = mapFd.erase(i);

diff --git a/Src/LTOpenGlider.cpp b/Src/LTOpenGlider.cpp
@@ -785,11 +785,10 @@ bool OpenGliderConnection::AcListDownloadMain ()
     // Download the file
     bool bRet = false;
     try {
-        char curl_errtxt[CURL_ERROR_SIZE];
         OGNCbHandoverTy ho;             // hand-over structure to callback
 
         // initialize the CURL handle
-        CURL *pCurl = curl_easy_init();
+        pCurl = curl_easy_init();
         if (!pCurl) {
             LOG_MSG(logERR,ERR_CURL_EASY_INIT);
             return false;
@@ -826,7 +825,6 @@ bool OpenGliderConnection::AcListDownloadMain ()
         if (cc == CURLE_OK)
         {
             // CURL was OK, now check HTTP response code
-            long httpResponse = 0;
             curl_easy_getinfo(pCurl, CURLINFO_RESPONSE_CODE, &httpResponse);
 
             // not HTTP_OK?
@@ -846,6 +844,7 @@ bool OpenGliderConnection::AcListDownloadMain ()
 
         // cleanup CURL handle
         curl_easy_cleanup(pCurl);
+        pCurl = nullptr;
     }
     catch (const std::exception& e) {
         LOG_MSG(logERR, "Fetching OGN a/c list failed with exception %s", e.what());