From af1661c9742d3aed18da31614bdb755540baa80a Mon Sep 17 00:00:00 2001
From: Zufu Liu <unknown>
Date: Thu, 9 Aug 2018 13:52:04 +1000
Subject: Bug [#2030]. Fix Win32 crash setting technology to default after
 bidirectional mode set.

---
 doc/ScintillaHistory.html | 3 +++
 win32/ScintillaWin.cxx    | 2 ++
 2 files changed, 5 insertions(+)

diff --git a/doc/ScintillaHistory.html b/doc/ScintillaHistory.html
index 18179c735..692ba5fcc 100644
--- a/doc/ScintillaHistory.html
+++ b/doc/ScintillaHistory.html
@@ -571,6 +571,9 @@
 	<li>
 	Fix a leak in the bidirectional code on Win32.
 	</li>
+	<li>
+	Fix crash on Win32 when switching technology to default after setting bidirectional mode.
+	</li>
     </ul>
     <h3>
        <a href="https://www.scintilla.org/scite410.zip">Release 4.1.0</a>
diff --git a/win32/ScintillaWin.cxx b/win32/ScintillaWin.cxx
index df4e1d248..f9886318e 100644
--- a/win32/ScintillaWin.cxx
+++ b/win32/ScintillaWin.cxx
@@ -1754,6 +1754,8 @@ sptr_t ScintillaWin::WndProc(unsigned int iMessage, uptr_t wParam, sptr_t lParam
 #else
 						return 0;
 #endif
+					} else {
+						bidirectional = EditModel::Bidirectional::bidiDisabled;
 					}
 #if defined(USE_D2D)
 					DropRenderTarget();
-- 
cgit v1.2.3