From d07d5e36de2e496edfc11200a355bf793365beee Mon Sep 17 00:00:00 2001
From: enricoturri1966 <enricoturri@seznam.cz>
Date: Fri, 28 Aug 2020 11:20:18 +0200
Subject: [PATCH] Follow-up of 93921dc7c8d975f2155bfc9d60a7c78bf8bf2745 ->
 Remove taskbar icon before to change it

---
 src/slic3r/GUI/MainFrame.cpp | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
index aadaeece66..886e96e1a0 100644
--- a/src/slic3r/GUI/MainFrame.cpp
+++ b/src/slic3r/GUI/MainFrame.cpp
@@ -280,8 +280,7 @@ DPIFrame(NULL, wxID_ANY, "", wxDefaultPosition, wxDefaultSize, wxDEFAULT_FRAME_S
 #if ENABLE_GCODE_VIEWER_TASKBAR_ICON
 MainFrame::~MainFrame()
 {
-    if (m_taskbar_icon != nullptr)
-        delete m_taskbar_icon;
+    delete m_taskbar_icon;
 }
 #endif // ENABLE_GCODE_VIEWER_TASKBAR_ICON
 
@@ -1419,8 +1418,10 @@ void MainFrame::set_mode(EMode mode)
 
         SetIcon(wxIcon(Slic3r::var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG));
 #if ENABLE_GCODE_VIEWER_TASKBAR_ICON
-        if (m_taskbar_icon  != nullptr)
+        if (m_taskbar_icon != nullptr) {
+            m_taskbar_icon->RemoveIcon();
             m_taskbar_icon->SetIcon(wxIcon(Slic3r::var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG), "PrusaSlicer");
+        }
 #endif // ENABLE_GCODE_VIEWER_TASKBAR_ICON
 
         break;
@@ -1470,8 +1471,10 @@ void MainFrame::set_mode(EMode mode)
 
         SetIcon(wxIcon(Slic3r::var("PrusaSlicerGCodeViewer_128px.png"), wxBITMAP_TYPE_PNG));
 #if ENABLE_GCODE_VIEWER_TASKBAR_ICON
-        if (m_taskbar_icon != nullptr)
+        if (m_taskbar_icon != nullptr) {
+            m_taskbar_icon->RemoveIcon();
             m_taskbar_icon->SetIcon(wxIcon(Slic3r::var("PrusaSlicer_128px.png"), wxBITMAP_TYPE_PNG), "PrusaSlicer-GCode viewer");
+        }
 #endif // ENABLE_GCODE_VIEWER_TASKBAR_ICON
 
         break;