Merge pull request #547 from nohal/macos_gl

Avoid crashes related to non-GL mode on macOS
jongough · Apr 2, 2024 · f004bc9 · f004bc9
2 parents c514acd + da04050
commit f004bc9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/opencpn-libs b/opencpn-libs
diff --git a/src/ODRolloverWin.cpp b/src/ODRolloverWin.cpp
@@ -66,7 +66,11 @@ ODRolloverWin::~ODRolloverWin()
 {
     m_timer_timeout.Stop();
     delete m_pbm;
-    glDeleteTextures(1, &m_texture);
+#ifdef ocpnUSE_GL
+    if (g_bOpenGL) {
+        glDeleteTextures(1, &m_texture);
+    }
+#endif
 }
 void ODRolloverWin::OnTimer( wxTimerEvent& event )
 {
+2 −0		nmea0183/src/nmea0183.cpp
+8 −5		plugin_dc/dc_utils/src/pidc.cpp
+4,337 −1,639		sqlite/include/sqlite3.h
+101,084 −52,801		sqlite/src/sqlite3.c