Protect against trying to deactivate busy spinner when not busy (fix …

…asserts in macOS non-GL)
davidsanner · Jun 4, 2024 · 0f81b3d · 0f81b3d
1 parent 13ac1bc
commit 0f81b3d
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 21 deletions.
diff --git a/gui/src/OCPNPlatform.cpp b/gui/src/OCPNPlatform.cpp
@@ -1681,25 +1681,11 @@ bool OCPNPlatform::hasInternalGPS(wxString profile) {
 //--------------------------------------------------------------------------
 
 void OCPNPlatform::ShowBusySpinner(void) {
-#ifdef __ANDROID__
-  androidShowBusyIcon();
-#else
-#if wxCHECK_VERSION(2, 9, 0)
-  //    if( !::wxIsBusy() )
-  { ::wxBeginBusyCursor(); }
-#endif
-#endif
+  AbstractPlatform::ShowBusySpinner();
 }
 
 void OCPNPlatform::HideBusySpinner(void) {
-#ifdef __ANDROID__
-  androidHideBusyIcon();
-#else
-#if wxCHECK_VERSION(2, 9, 0)
-  //    if( ::wxIsBusy() )
-  { ::wxEndBusyCursor(); }
-#endif
-#endif
+  AbstractPlatform::ShowBusySpinner();
 }
 
 double OCPNPlatform::GetDisplayDensityFactor() {

diff --git a/model/include/model/base_platform.h b/model/include/model/base_platform.h
@@ -166,6 +166,7 @@ class AbstractPlatform {
 #endif
   int m_monitorWidth, m_monitorHeight;
   bool m_bdisableWindowsDisplayEnum;
+  static bool m_isBusy;
 };
 
 class BasePlatform : public AbstractPlatform {

diff --git a/model/src/base_platform.cpp b/model/src/base_platform.cpp
@@ -77,6 +77,8 @@ static const char PATH_SEP = ';';
 static const char PATH_SEP = ':';
 #endif
 
+bool AbstractPlatform::m_isBusy = false;
+
 static const char* const DEFAULT_XDG_DATA_DIRS =
     "~/.local/share:/usr/local/share:/usr/share";
 
@@ -744,17 +746,36 @@ wxString AbstractPlatform::GetPluginDataPath() {
   return m_pluginDataPath;
 }
 
-
 #ifdef __ANDROID__
-void AbstractPlatform::ShowBusySpinner() { androidShowBusyIcon(); }
+void AbstractPlatform::ShowBusySpinner() {
+  if (!m_isBusy) {
+    androidShowBusyIcon();
+    m_isBusy = true;
+  }
+}
 #else
-void AbstractPlatform::ShowBusySpinner() { ::wxBeginBusyCursor(); }
+void AbstractPlatform::ShowBusySpinner() {
+  if (!m_isBusy) {
+    ::wxBeginBusyCursor();
+    m_isBusy = true;
+  }
+}
 #endif
 
 #ifdef __ANDROID__
-void AbstractPlatform::HideBusySpinner() { androidHideBusyIcon(); }
+void AbstractPlatform::HideBusySpinner() {
+  if (m_isBusy) {
+    androidHideBusyIcon();
+    m_isBusy = false;
+  }
+}
 #else
-void AbstractPlatform::HideBusySpinner() { ::wxEndBusyCursor(); }
+void AbstractPlatform::HideBusySpinner() {
+  if (m_isBusy) {
+    ::wxEndBusyCursor();
+    m_isBusy = false;
+  }
+}
 #endif
 
 // getDisplaySize