From 3a8d7270b2eeaab9884eacc012ec968ba0b2da06 Mon Sep 17 00:00:00 2001
From: Neil <nyamatongwe@gmail.com>
Date: Sat, 6 Jun 2020 13:41:58 +1000
Subject: Add ReleaseUnknown to safely release IUnknown* and avoid warnings
 when done in noexcept context.

---
 win32/ScintillaWin.cxx | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

(limited to 'win32/ScintillaWin.cxx')

diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 916185569..38fa351c0 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -678,10 +678,7 @@ void ScintillaWin::EnsureRenderTarget(HDC hdc) {
 }
 
 void ScintillaWin::DropRenderTarget() {
-	if (pRenderTarget) {
-		pRenderTarget->Release();
-		pRenderTarget = nullptr;
-	}
+	ReleaseUnknown(pRenderTarget);
 }
 
 #endif
@@ -3469,8 +3466,7 @@ LRESULT PASCAL ScintillaWin::CTWndProc(
 #endif
 				surfaceWindow->Release();
 #if defined(USE_D2D)
-				if (pCTRenderTarget)
-					pCTRenderTarget->Release();
+				ReleaseUnknown(pCTRenderTarget);
 #endif
 				::EndPaint(hWnd, &ps);
 				return 0;
-- 
cgit v1.2.3