summaryrefslogtreecommitdiff
path: root/plugins/AVS/src/acc.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'plugins/AVS/src/acc.cpp')
-rw-r--r--plugins/AVS/src/acc.cpp7
1 files changed, 2 insertions, 5 deletions
diff --git a/plugins/AVS/src/acc.cpp b/plugins/AVS/src/acc.cpp
index 75ba7bdbf9..256f92936d 100644
--- a/plugins/AVS/src/acc.cpp
+++ b/plugins/AVS/src/acc.cpp
@@ -399,8 +399,8 @@ static LRESULT CALLBACK ACCWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
return TRUE;
case WM_NCDESTROY:
- DestroyAnimation(data);
if (data) {
+ DestroyAnimation(data);
UnhookEvent(data->hHook);
UnhookEvent(data->hHookMy);
mir_free(data);
@@ -421,10 +421,7 @@ static LRESULT CALLBACK ACCWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP
DestroyAnimation(data);
data->hContact = lParam;
- if (lParam == NULL)
- data->proto[0] = '\0';
- else
- mir_strncpy(data->proto, GetContactProto(data->hContact), sizeof(data->proto));
+ mir_strncpy(data->proto, GetContactProto(data->hContact), sizeof(data->proto));
StartAnimation(data);