fixes #3590 (Clist_nicer: не работает кнопка "Убрать скин")

2 files changed, 11 insertions, 2 deletions

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);