From 7986af1d253c409e34b2d7aeae7032fdaccb64e5 Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Sat, 28 Feb 2015 05:39:53 -1000 Subject: [PATCH] Prevent crashes upon startup and/or new tab when using input methods TerminalDisplay::inputMethodQuery causes crashes when using non-standard input methods. Qt::ImSurroundingText was trying to use lineProperties of the current line, but this parameter is ignored in decodeLine anyway. Thanks to Takahiro Hashimoto kenya888 gmail com for report, research and patch BUG: 341798 --- src/TerminalDisplay.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/TerminalDisplay.cpp b/src/TerminalDisplay.cpp index b152f83f..dbd62479 100644 --- a/src/TerminalDisplay.cpp +++ b/src/TerminalDisplay.cpp @@ -2827,7 +2827,7 @@ QVariant TerminalDisplay::inputMethodQuery(Qt::InputMethodQuery query) const QTextStream stream(&lineText); PlainTextDecoder decoder; decoder.begin(&stream); - decoder.decodeLine(&_image[loc(0, cursorPos.y())], _usedColumns, _lineProperties[cursorPos.y()]); + decoder.decodeLine(&_image[loc(0, cursorPos.y())], _usedColumns, LINE_DEFAULT); decoder.end(); return lineText; }