Merge pull request #278 from TwinFan/master

v4.1.1
TwinFan · Dec 6, 2024 · e7015e3 · e7015e3
2 parents e161777 + e0c7bc2
commit e7015e3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 12 deletions.
diff --git a/.github/actions/build-lin/action.yml b/.github/actions/build-lin/action.yml
@@ -15,6 +15,9 @@ outputs:
   xpl-file-name:
     description: Path to the resulting xpl file
     value: ${{ steps.return.outputs.xpl-file-name }}
+  pdb-file-name:
+    description: Path to the resulting .debug.zip file (debug symbol info)
+    value: ${{ steps.return.outputs.pdb-file-name }}
 
 runs:
   using: "composite"

diff --git a/.github/actions/build-mac/action.yml b/.github/actions/build-mac/action.yml
@@ -15,6 +15,9 @@ outputs:
   xpl-file-name:
     description: Path to the resulting xpl file
     value: ${{ steps.return.outputs.xpl-file-name }}
+  pdb-file-name:
+    description: Path to the resulting .dSYM.zip file (debug symbol info)
+    value: ${{ steps.return.outputs.pdb-file-name }}
 
 runs:
   using: "composite"

diff --git a/Src/LTRealTraffic.cpp b/Src/LTRealTraffic.cpp
@@ -732,10 +732,6 @@ bool RealTrafficConnection::ProcessFetchedData ()
 // in direct mode process an object with aircraft data, essentially a fake array
 bool RealTrafficConnection::ProcessTrafficBuffer (const JSON_Object* pBuf)
 {
-    // FIXME: Remove this Crash Handler Test Code!!!
-    void* p = (void*)dataRefs.ShallLogWeather();
-    std::memset(p, 0, SIZE_MAX);
-
     // Quick exit if no data
     if (!pBuf) return false;
 

diff --git a/Src/LiveTraffic.cpp b/Src/LiveTraffic.cpp
@@ -92,14 +92,6 @@ void MenuHandler(void * /*mRef*/, void * iRef)
                                   ACIWnd::ToggleHideShowAll() ? xplm_Menu_Checked : xplm_Menu_Unchecked);
                 break;
             case MENU_ID_AC_INFO_WND_CLOSE_ALL:
-
-                // FIXME: Remove this crash-test code!!!
-                {
-                    int zero = (int)reinterpret_cast<unsigned long long>(iRef);
-                    zero -= 5;
-                    dataRefs.SetMaxNumAc(zero / zero);
-                }
-
                 ACIWnd::CloseAll();
                 break;
             case MENU_ID_TOGGLE_AIRCRAFT: