From 8a2cd19d95c4846e76381e46808a325875da5ecf Mon Sep 17 00:00:00 2001
From: Anders Jenbo <anders@jenbo.dk>
Date: Fri, 10 Jan 2020 05:47:25 +0100
Subject: [PATCH] DisableInputWndProc clean up

---
 Source/diablo.cpp | 37 +++++++++++++++++++------------------
 1 file changed, 19 insertions(+), 18 deletions(-)

diff --git a/Source/diablo.cpp b/Source/diablo.cpp
index cb6a73a8c..c60cedd98 100644
--- a/Source/diablo.cpp
+++ b/Source/diablo.cpp
@@ -641,32 +641,33 @@ LRESULT CALLBACK DisableInputWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM
 	case WM_MOUSEMOVE:
 		return 0;
 	case WM_LBUTTONDOWN:
-		if (sgbMouseDown == 0) {
-			sgbMouseDown = 1;
-			SetCapture(hWnd);
-		}
+		if (sgbMouseDown != 0)
+			return 0;
+		sgbMouseDown = 1;
+		SetCapture(hWnd);
 		return 0;
 	case WM_LBUTTONUP:
-		if (sgbMouseDown == 1) {
-			sgbMouseDown = 0;
-			ReleaseCapture();
-		}
+		if (sgbMouseDown != 1)
+			return 0;
+		sgbMouseDown = 0;
+		ReleaseCapture();
 		return 0;
 	case WM_RBUTTONDOWN:
-		if (sgbMouseDown == 0) {
-			sgbMouseDown = 2;
-			SetCapture(hWnd);
-		}
+		if (sgbMouseDown != 0)
+			return 0;
+		sgbMouseDown = 2;
+		SetCapture(hWnd);
 		return 0;
 	case WM_RBUTTONUP:
-		if (sgbMouseDown == 2) {
-			sgbMouseDown = 0;
-			ReleaseCapture();
-		}
+		if (sgbMouseDown != 2)
+			return 0;
+		sgbMouseDown = 0;
+		ReleaseCapture();
 		return 0;
 	case WM_CAPTURECHANGED:
-		if (hWnd != (HWND)lParam)
-			sgbMouseDown = 0;
+		if (hWnd == (HWND)lParam)
+			return 0;
+		sgbMouseDown = 0;
 		return 0;
 	}