minor fixes

4 files changed, 11 insertions, 6 deletions

diff --git a/plugins/Clist_modern/src/modern_aniavatars.cpp b/plugins/Clist_modern/src/modern_aniavatars.cpp
index c45c91ee0e..b98eae48c7 100644
--- a/plugins/Clist_modern/src/modern_aniavatars.cpp
+++ b/plugins/Clist_modern/src/modern_aniavatars.cpp
@@ -841,7 +841,6 @@ int AniAva_RedrawAllAvatars(BOOL updateZOrder)
 {

 	aacheck 0;

 	mir_cslock lck(s_CS);

-	updateZOrder = 1;

 	for (auto &it : s_Objects) {

 		if (updateZOrder)

 			SendMessage(it->hWindow, AAM_REDRAW, (WPARAM)updateZOrder, 0);

diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp
index f7a4b44242..0674df3f1b 100644
--- a/plugins/MyDetails/src/frame.cpp
+++ b/plugins/MyDetails/src/frame.cpp
@@ -592,15 +592,21 @@ void DeleteTooltipWindows(MyDetailsFrameData *data)
 void CalcRectangles(HWND hwnd)

 {

 	HDC hdc = GetDC(hwnd);

+	if (hdc == nullptr)

+		return;

+

 	HFONT hOldFont = (HFONT)GetCurrentObject(hdc, OBJ_FONT);

 	MyDetailsFrameData *data = (MyDetailsFrameData *)GetWindowLongPtr(hwnd, GWLP_USERDATA);

-

-	if (hdc == nullptr || data == nullptr)

+	if (data == nullptr) {

+		ReleaseDC(hwnd, hdc);

 		return;

+	}

 

 	Protocol *proto = protocols->Get(data->protocol_number);

-	if (proto == nullptr)

+	if (proto == nullptr) {

+		ReleaseDC(hwnd, hdc);

 		return;

+	}

 

 	data->recalc_rectangles = false;

 	proto->data_changed = false;

diff --git a/plugins/Popup/src/avatars_gif.cpp b/plugins/Popup/src/avatars_gif.cpp
index bfb5d63368..29c4926606 100644
--- a/plugins/Popup/src/avatars_gif.cpp
+++ b/plugins/Popup/src/avatars_gif.cpp
@@ -67,8 +67,8 @@ void GifAvatar::draw(MyBitmap *bmp, int x, int y, int w, int h, POPUPOPTIONS *op
 			mir_free(frameDelays);

 			frameDelays = nullptr;

 		}

-		if (hBitmap) DeleteObject(hBitmap);

 		GDIPlus_ExtractAnimatedGIF(av->szFilename, w, h, hBitmap, frameDelays, frameCount, frameSize);

+		if (hBitmap) DeleteObject(hBitmap);

 	}

 

 	if (!frameCount) return;

diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp
index 81a4be9065..cf5fded890 100644
--- a/plugins/TabSRMM/src/msgdlgutils.cpp
+++ b/plugins/TabSRMM/src/msgdlgutils.cpp
@@ -1208,7 +1208,7 @@ void CTabBaseDlg::LoadSplitter()
 	}

 	else m_iSplitterY = (int)M.GetDword(m_hContact, "splitsplity", M.GetDword("splitsplity", 60));

 

-	if (m_iSplitterY < MINSPLITTERY || m_iSplitterY < 0)

+	if (m_iSplitterY < MINSPLITTERY)

 		m_iSplitterY = 150;

 }