From 23e70800d746a46ffc40dd873517c9f3ed50bd6b Mon Sep 17 00:00:00 2001
From: nyamatongwe <unknown>
Date: Tue, 4 Nov 2003 10:09:56 +0000
Subject: Fix to potential problem with SetTimer.

---
 win32/ScintillaWin.cxx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index 20f0cd4d9..4c9f7341a 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -887,7 +887,11 @@ void ScintillaWin::SetTicking(bool on) {
 	if (timer.ticking != on) {
 		timer.ticking = on;
 		if (timer.ticking) {
-			timer.tickerID = reinterpret_cast<TickerID>(::SetTimer(MainHWND(), 1, timer.tickSize, NULL));
+			timer.tickerID = reinterpret_cast<TickerID>(1);
+			if (::SetTimer(MainHWND(), reinterpret_cast<uptr_t>(timer.tickerID), timer.tickSize, NULL) == 0) {
+				timer.ticking = false;
+				timer.tickerID = 0; 
+			}
 		} else {
 			::KillTimer(MainHWND(), reinterpret_cast<uptr_t>(timer.tickerID));
 			timer.tickerID = 0;
-- 
cgit v1.2.3