This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch bugfix/help-cmd in repository x2goclient. commit e14d4289905ff89064fd613e7f1e41a6dd8b021f Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Apr 22 19:15:42 2015 +0200 help.cpp: clear current string if completely written onto one line. --- debian/changelog | 1 + src/help.cpp | 1 + 2 files changed, 2 insertions(+) diff --git a/debian/changelog b/debian/changelog index bfa56c2..8849c1b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -274,6 +274,7 @@ x2goclient (4.0.4.0-0x2go1) UNRELEASED; urgency=low - {{onmainwindow,help}.cpp},help.h}: fix misc. build errors. - help.h: fix run time error by actually giving QTextStream a "device" to write to. + - help.cpp: clear current string if completely written onto one line. [ Fernando Pedemonte ] * New upstream release (4.0.4.0): diff --git a/src/help.cpp b/src/help.cpp index a8caf2b..1ddb360 100644 --- a/src/help.cpp +++ b/src/help.cpp @@ -206,6 +206,7 @@ QString help::pretty_print (help::data_t data) { /* Fits onto the current line. Great! */ if (remaining > static_cast<std::ptrdiff_t> (cur_len)) { out << working_copy; + working_copy = ""; } else { /* Try to find the next split point. */ -- Alioth's /srv/git/code.x2go.org/x2goclient.git//..//_hooks_/post-receive-email on /srv/git/code.x2go.org/x2goclient.git