From 5cd1ba0ebee04d64386ec1ad20abec17153b18ea Mon Sep 17 00:00:00 2001
From: Dimitar Radev <unknown>
Date: Tue, 6 Feb 2018 16:57:12 +1100
Subject: [Bug #1983] Fix double tap word selection on Windows 10 1709 Fall
 Creators Update. Times of observed mouse events went backwards causing
 unsigned overflow.

---
 doc/ScintillaHistory.html | 5 +++++
 src/Editor.cxx            | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 9e01bfcec..6abca8d23 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -519,6 +519,7 @@
       </tr><tr>
 	<td>Georger Araújo</td>
 	<td>Tobias Kühne</td>
+	<td>Dimitar Radev</td>
     </tr>
     </table>
     <p>
@@ -557,6 +558,10 @@
 	Improve VHDL lexer's handling of character literals and escape characters in strings.
 	</li>
 	<li>
+	Fix double tap word selection on Windows 10 1709 Fall Creators Update.
+	<a href="http://sourceforge.net/p/scintilla/bugs/1983/">Bug #1983</a>.
+	</li>
+	<li>
 	Fix closing autocompletion lists on Cocoa for macOS 10.13 where the window
 	was emptying but staying visible.
 	<a href="http://sourceforge.net/p/scintilla/bugs/1981/">Bug #1981</a>.
diff --git a/src/Editor.cxx b/src/Editor.cxx
index b6e572c24..f33eefe69 100644
--- a/src/Editor.cxx
+++ b/src/Editor.cxx
@@ -4455,7 +4455,7 @@ void Editor::ButtonDownWithModifiers(Point pt, unsigned int curTime, int modifie
 	if (shift && !inSelMargin) {
 		SetSelection(newPos);
 	}
-	if (((curTime - lastClickTime) < Platform::DoubleClickTime()) && Close(pt, lastClick, doubleClickCloseThreshold)) {
+	if ((curTime < (lastClickTime+Platform::DoubleClickTime())) && Close(pt, lastClick, doubleClickCloseThreshold)) {
 		//Platform::DebugPrintf("Double click %d %d = %d\n", curTime, lastClickTime, curTime - lastClickTime);
 		SetMouseCapture(true);
 		FineTickerStart(tickScroll, 100, 10);
-- 
cgit v1.2.3