From f34a7a0e3a3ea516827909c36d2758fc85d37b73 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Thu, 20 Jul 2023 14:12:31 +0300
Subject: =?UTF-8?q?fixes=20#3590=20(Clist=5Fnicer:=20=D0=BD=D0=B5=20=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B1=D0=BE=D1=82=D0=B0=D0=B5=D1=82=20=D0=BA=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=BF=D0=BA=D0=B0=20"=D0=A3=D0=B1=D1=80=D0=B0=D1=82=D1=8C=20?=
 =?UTF-8?q?=D1=81=D0=BA=D0=B8=D0=BD")?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/Clist_nicer/src/extBackg.cpp | 12 +++++++++++-
 plugins/Clist_nicer/src/extBackg.h   |  1 -
 2 files changed, 11 insertions(+), 2 deletions(-)

(limited to 'plugins/Clist_nicer/src')

diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp
index b11476f9fb..08e02c72d2 100644
--- a/plugins/Clist_nicer/src/extBackg.cpp
+++ b/plugins/Clist_nicer/src/extBackg.cpp
@@ -1273,7 +1273,7 @@ void IMG_LoadItems()
 void LoadPerContactSkins(wchar_t *tszFileName)
 {
 	char szItem[100];
-	ptrA szSections(LPSTR(calloc(3002, 1)));
+	ptrA szSections(LPSTR(mir_calloc(3002)));
 	char *p = szSections;
 
 	StatusItems_t *items = nullptr, *this_item;
@@ -1562,9 +1562,19 @@ static INT_PTR CALLBACK DlgProcSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, L
 			break;
 
 		case IDC_UNLOAD:
+			db_delete_module(0, "CLC");
+			db_delete_module(0, "CLCExt");
 			IMG_DeleteItems();
+			LoadExtBkSettingsFromDB();
+
+			ReloadThemedOptions();
+			ReloadSkinItemsToCache();
+
+			db_set_b(0, "CLUI", "useskin", 0);
+			IMG_LoadItems();
 			ConfigureFrame();
 			SetButtonStates();
+
 			SendMessage(g_clistApi.hwndContactList, WM_SIZE, 0, 0);
 			PostMessage(g_clistApi.hwndContactList, CLUIINTM_REDRAW, 0, 0);
 			break;
diff --git a/plugins/Clist_nicer/src/extBackg.h b/plugins/Clist_nicer/src/extBackg.h
index 6892e71007..482135acc9 100644
--- a/plugins/Clist_nicer/src/extBackg.h
+++ b/plugins/Clist_nicer/src/extBackg.h
@@ -80,7 +80,6 @@ void LoadExtBkSettingsFromDB();
 void IMG_LoadItems();
 void __fastcall IMG_RenderImageItem(HDC hdc, ImageItem *item, RECT *rc);
 void IMG_InitDecoder();
-void LoadPerContactSkins(const wchar_t *file);
 
 static void SaveCompleteStructToDB();
 StatusItems_t *GetProtocolStatusItem(const char *szProto);
-- 
cgit v1.2.3