Suppressed double hiding/deletion of caret which can cause the caret to go missing from a different window that's currently focused

2015-09-28 14:18:34 +01:00
parent 40430585d6
commit 965786a0fa
1 changed files with 11 additions and 6 deletions
--- a/src/stc/ScintillaWX.cpp
+++ b/src/stc/ScintillaWX.cpp
@@ -705,13 +705,18 @@ bool ScintillaWX::CreateSystemCaret() {

 bool ScintillaWX::DestroySystemCaret() {
 #ifdef __WXMSW__
-    ::HideCaret(GetHwndOf(stc));
-    BOOL retval = ::DestroyCaret();
-    if (sysCaretBitmap) {
-        ::DeleteObject(sysCaretBitmap);
-        sysCaretBitmap = 0;
+    if (sysCaretBitmap)
+    {
+        ::HideCaret(GetHwndOf(stc));
+        BOOL retval = ::DestroyCaret();
+        if (sysCaretBitmap) {
+            ::DeleteObject(sysCaretBitmap);
+            sysCaretBitmap = 0;
+        }
+        return retval != 0;
    }
-    return retval != 0;
+    else
+        return false;
 #else
    return false;
 #endif