From 58b5bb07de4bcbf670db5ad79ff8b9bd7afc1e28 Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期二, 17 六月 2025 11:35:47 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang

---
 SourceCode/Bond/Servo/BlButton.cpp |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/SourceCode/Bond/Servo/BlButton.cpp b/SourceCode/Bond/Servo/BlButton.cpp
index 5eb7694..2bddd2b 100644
--- a/SourceCode/Bond/Servo/BlButton.cpp
+++ b/SourceCode/Bond/Servo/BlButton.cpp
@@ -219,8 +219,7 @@
 		hFont = (HFONT)pFont->GetSafeHandle();
 	}
 
-
-	::SelectObject(hDC, hFont);
+	HFONT hOldFont = (HFONT)::SelectObject(hDC, hFont);
 	::SetBkMode(hDC, TRANSPARENT);
 	::SetTextColor(hDC, m_crText[state]);
 
@@ -237,6 +236,7 @@
 		}
 		DrawTextA(hDC, szText, (int)strlen(szText), &rcText, DT_VCENTER | DT_CENTER | DT_SINGLELINE | DT_END_ELLIPSIS);
 	}
+	::SelectObject(hDC, hOldFont);
 
 
 	// 是否有小圆点
@@ -283,8 +283,8 @@
 		::Polygon(hDC, pt, 3);
 		::SelectObject(hDC, hOldBrush);
 		::SelectObject(hDC, hOldPen);
-		::DeleteObject(hBrush);
-		::DeleteObject(hPen);
+		::DeleteObject(hbrDrop);     // 正确释放小三角使用的画刷
+		::DeleteObject(hPenDrop);    // 正确释放小三角的笔
 	}
 }
 

--
Gitblit v1.9.3