From: datadiode <j.tucht@arcor.de>
Date: Sat, 19 Sep 2020 09:33:08 +0000 (+0200)
Subject: MainFrm.cpp: Toolbar was leaking image lists
X-Git-Tag: 2.16.9~145^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=56271b0fdbe408a61bd37fe2dbe9a276ac354a06;p=winmerge-jp%2Fwinmerge-jp.git

MainFrm.cpp: Toolbar was leaking image lists
---

diff --git a/Src/MainFrm.cpp b/Src/MainFrm.cpp
index 30a20ce96..0239678cb 100644
--- a/Src/MainFrm.cpp
+++ b/Src/MainFrm.cpp
@@ -2028,8 +2028,8 @@ void CMainFrame::LoadToolbarImages()
 	const int toolbarOrgImgSize = toolbarNewImgSize <= 20 ? 16 : 32;
 	CToolBarCtrl& BarCtrl = m_wndToolBar.GetToolBarCtrl();
 
-	m_ToolbarImages[TOOLBAR_IMAGES_ENABLED].DeleteImageList();
-	m_ToolbarImages[TOOLBAR_IMAGES_DISABLED].DeleteImageList();
+	m_ToolbarImages[TOOLBAR_IMAGES_ENABLED].Detach();
+	m_ToolbarImages[TOOLBAR_IMAGES_DISABLED].Detach();
 	CSize sizeButton(0, 0);
 
 	LoadToolbarImageList(toolbarOrgImgSize, toolbarNewImgSize,
@@ -2042,10 +2042,10 @@ void CMainFrame::LoadToolbarImages()
 	sizeButton = CSize(toolbarNewImgSize + 8, toolbarNewImgSize + 8);
 
 	BarCtrl.SetButtonSize(sizeButton);
-	BarCtrl.SetImageList(&m_ToolbarImages[TOOLBAR_IMAGES_ENABLED]);
-	BarCtrl.SetDisabledImageList(&m_ToolbarImages[TOOLBAR_IMAGES_DISABLED]);
-	m_ToolbarImages[TOOLBAR_IMAGES_ENABLED].Detach();
-	m_ToolbarImages[TOOLBAR_IMAGES_DISABLED].Detach();
+	if (CImageList *pImgList = BarCtrl.SetImageList(&m_ToolbarImages[TOOLBAR_IMAGES_ENABLED]))
+		pImgList->DeleteImageList();
+	if (CImageList *pImgList = BarCtrl.SetDisabledImageList(&m_ToolbarImages[TOOLBAR_IMAGES_DISABLED]))
+		pImgList->DeleteImageList();
 
 	// resize the rebar.
 	REBARBANDINFO rbbi = { sizeof REBARBANDINFO };