Changeset 6017

Timestamp:

Nov 2, 2009, 11:42:16 PM (15 years ago)

Author:

rgrieder

Message:

Fix in Shell: No string in outputLines_ should contain '\n'.

File:

• code/branches/console/src/libraries/core/Shell.cc (modified) (2 diffs)

code/branches/console/src/libraries/core/Shell.cc

@@ -31 +31 @@
 #include "util/OutputHandler.h"
 #include "util/StringUtils.h"
+#include "util/SubString.h"
 #include "CommandExecutor.h"
 #include "CoreIncludes.h"
@@ -192 +193 @@
     void Shell::addOutputLine(const std::string& line, int level)
     {
-        if (level <= this->softDebugLevel_)
-            this->outputLines_.push_front(line);
-        this->updateListeners<&ShellListener::lineAdded>();
+        // Make sure we really only have one line per line (no new lines!)
+        SubString lines(line, '\n');
+        for (unsigned i = 0; i < lines.size(); ++i)
+        {
+            if (level <= this->softDebugLevel_)
+                this->outputLines_.push_front(lines[i]);
+            this->updateListeners<&ShellListener::lineAdded>();
+        }
     }