summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKurt Hindenburg <[email protected]>2015-03-28 10:14:37 -0900
committerKurt Hindenburg <[email protected]>2015-03-28 10:14:37 -0900
commit7017a999d620562f7e51fd11303630bd0c4bf2ff (patch)
treefd623a0c9a9c7a46ab62c98a84329ef8af55e3a1
parent74fd144ce3dc06898121674e9eec3dbe8a1bbf6d (diff)
Fix hang in exiting konsole with Ctrl+D with QInputMethodQuery
Add missing incrementation in for loop in decodeLine() Thanks to Takahiro Hashimoto kenya888 gmail com for research, bug and fix. BUG: 345294 REIVEW: 123143
-rw-r--r--src/TerminalCharacterDecoder.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/TerminalCharacterDecoder.cpp b/src/TerminalCharacterDecoder.cpp
index d185eda..1c5fff4 100644
--- a/src/TerminalCharacterDecoder.cpp
+++ b/src/TerminalCharacterDecoder.cpp
@@ -116,6 +116,8 @@ void PlainTextDecoder::decodeLine(const Character* const characters, int count,
const QString s = QString::fromUtf16(chars, extendedCharLength);
plainText.append(s);
i += qMax(1, string_width(s));
+ } else {
+ ++i;
}
} else {
// All characters which appear before the last real character are