# HG changeset patch # User michi_cc # Date 2013-11-14 23:03:54 # Node ID 99b9f68e0f1408adc413b8134509fe981b443f8c # Parent c792fb9994a00457c6f2cc1cb2bb0a83f1b8eb08 (svn r26001) -Fix [FS#5795a] (r25686): [OSX] Clear any pending marked characters from an edit box losing focus. diff --git a/src/console_gui.cpp b/src/console_gui.cpp --- a/src/console_gui.cpp +++ b/src/console_gui.cpp @@ -185,6 +185,7 @@ struct IConsoleWindow : Window ~IConsoleWindow() { _iconsole_mode = ICONSOLE_CLOSED; + _video_driver->EditBoxLostFocus(); } /** diff --git a/src/video/cocoa/cocoa_v.mm b/src/video/cocoa/cocoa_v.mm --- a/src/video/cocoa/cocoa_v.mm +++ b/src/video/cocoa/cocoa_v.mm @@ -579,6 +579,8 @@ void VideoDriver_Cocoa::EditBoxLostFocus [ [ NSInputManager currentInputManager ] markedTextAbandoned:_cocoa_subdriver->cocoaview ]; } } + /* Clear any marked string from the current edit box. */ + HandleTextInput(NULL, true); } /**