summaryrefslogtreecommitdiff
path: root/plugins/Clist_modern/src
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/Clist_modern/src')
-rw-r--r--plugins/Clist_modern/src/modern_aniavatars.cpp3
-rw-r--r--plugins/Clist_modern/src/modern_clc.cpp4
-rw-r--r--plugins/Clist_modern/src/modern_gettextasync.cpp3
3 files changed, 7 insertions, 3 deletions
diff --git a/plugins/Clist_modern/src/modern_aniavatars.cpp b/plugins/Clist_modern/src/modern_aniavatars.cpp
index f6e36bd95a..679f5283fa 100644
--- a/plugins/Clist_modern/src/modern_aniavatars.cpp
+++ b/plugins/Clist_modern/src/modern_aniavatars.cpp
@@ -1009,7 +1009,8 @@ int AniAva_InitModule()
void _AniAva_OnModulesUnload()
{
- SetEvent(s_hExitEvent);
+ if (s_hExitEvent)
+ SetEvent(s_hExitEvent);
}
int AniAva_UnloadModule()
diff --git a/plugins/Clist_modern/src/modern_clc.cpp b/plugins/Clist_modern/src/modern_clc.cpp
index 2f31dc6777..34c9c76e16 100644
--- a/plugins/Clist_modern/src/modern_clc.cpp
+++ b/plugins/Clist_modern/src/modern_clc.cpp
@@ -1331,8 +1331,10 @@ static LRESULT clcOnDestroy(ClcData *dat, HWND hwnd, UINT msg, WPARAM wParam, LP
ImageArray_Clear(&dat->avatar_cache);
DeleteDC(dat->avatar_cache.hdc);
ImageArray_Free(&dat->avatar_cache, FALSE);
- if (dat->himlHighlight)
+ if (dat->himlHighlight) {
ImageList_Destroy(dat->himlHighlight);
+ dat->himlHighlight = NULL;
+ }
RowHeights_Free(dat);
corecli.pfnContactListControlWndProc(hwnd, msg, wParam, lParam);
diff --git a/plugins/Clist_modern/src/modern_gettextasync.cpp b/plugins/Clist_modern/src/modern_gettextasync.cpp
index 43738f5246..71e81c05ed 100644
--- a/plugins/Clist_modern/src/modern_gettextasync.cpp
+++ b/plugins/Clist_modern/src/modern_gettextasync.cpp
@@ -161,7 +161,8 @@ void gtaRenewText(MCONTACT hContact)
void gtaShutdown()
{
- SetEvent(hgtaWakeupEvent);
+ if (hgtaWakeupEvent)
+ SetEvent(hgtaWakeupEvent);
}
void InitCacheAsync()