Merge pull request #558 from bdbcat/updates

Correct Init()/Deinit() cycle behavior
jongough · Oct 19, 2024 · 4aa3d73 · 4aa3d73
2 parents c3a017c + 7bf79ae
commit 4aa3d73
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/ODicons.cpp b/src/ODicons.cpp
@@ -105,6 +105,12 @@ void ODicons::initialize_images(void)
 
     m_failedBitmapLoad = false;
 
+    // Reload scaling constants to pick up global changes
+    // and local config file
+    m_iToolScaleFactor = GetOCPNGUIToolScaleFactor_PlugIn();
+    m_iToolIconScaleFactor = g_IconDisplayScaleFactor * m_iToolScaleFactor;
+    m_iToolIconRefSize = g_IconDisplayScaleFactor * m_iToolScaleFactor;
+
 #ifdef ODraw_USE_MUI
     m_FileName.SetFullName(wxT("ODManager_MUI.svg"));
     m_s_ocpn_draw_pi = m_FileName.GetFullPath();

diff --git a/src/ocpn_draw_pi.cpp b/src/ocpn_draw_pi.cpp
@@ -873,13 +873,10 @@ bool ocpn_draw_pi::DeInit(void)
 
     if( g_pODToolbar ) {
         g_pODToolbar->Unbind(wxEVT_MENU, &ODToolbarImpl::OnToolButtonClick, g_pODToolbar);
-        delete m_pODicons;
-        m_pODicons = NULL;
+        delete g_pODToolbar;
+        g_pODToolbar = NULL;
     }
 
-    delete m_pODicons;
-    m_pODicons = NULL;
-
     if( g_ODEventHandler ) {
         if(g_ODEventHandler->GetEvtHandlerEnabled())
             g_ODEventHandler->SetEvtHandlerEnabled(false);