diff --git a/src/stc/ScintillaWX.cpp b/src/stc/ScintillaWX.cpp index b639c0320d..7bc3d8c050 100644 --- 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