summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2013-07-10 16:23:32 -0300
committerTomás Touceda <chiiph@leap.se>2013-07-10 16:23:32 -0300
commitb46950d1bd05f2983bbe7ce4fefbbf29e00279b3 (patch)
tree4dd1fe1f7f08758561d11c8c22e798e4d179b245
parent6425331ad6cb74ac44ed95b98adf4eae0f6e6255 (diff)
parent5718cff69ac12b57af4533859a0e8e01afbca354 (diff)
Merge remote-tracking branch 'ivan/bug/3151_parse-return-in-logger' into develop
-rw-r--r--changes/bug_3151-parse-return-in-logger1
-rw-r--r--src/leap/gui/loggerwindow.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/changes/bug_3151-parse-return-in-logger b/changes/bug_3151-parse-return-in-logger
new file mode 100644
index 00000000..734588aa
--- /dev/null
+++ b/changes/bug_3151-parse-return-in-logger
@@ -0,0 +1 @@
+ o Bugfix: parse line return in the logger window. Closes #3151.
diff --git a/src/leap/gui/loggerwindow.py b/src/leap/gui/loggerwindow.py
index dd724ac7..dc1e273d 100644
--- a/src/leap/gui/loggerwindow.py
+++ b/src/leap/gui/loggerwindow.py
@@ -78,6 +78,7 @@ class LoggerWindow(QtGui.QWidget):
"""
level = log[LeapLogHandler.RECORD_KEY].levelname
message = log[LeapLogHandler.MESSAGE_KEY]
+ message = message.replace('\n', '<br>\n')
if self._logs_to_display[level]:
self.ui.txtLogHistory.append(message)