Changeset 6364 for code/branches

Timestamp:

Dec 16, 2009, 9:42:16 PM (15 years ago)

Author:

rgrieder

Message:

Fixed output problem in Shell (non complete line output was not processed correctly).

File:

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

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

@@ -197 +197 @@
         {
             this->outputLines_.push_front(std::make_pair(lines[i], type));
-            this->updateListeners<&ShellListener::lineAdded>();
+
+            if (this->scrollPosition_)
+                this->scrollPosition_++;
+            else
+                this->scrollIterator_ = this->outputLines_.begin();
+
+            this->bFinishedLastLine_ = true;
+            if (!this->scrollPosition_)
+                this->updateListeners<&ShellListener::lineAdded>();
         }
     }
@@ -261 +269 @@
 
             if (this->bFinishedLastLine_)
-            {
-                this->outputLines_.push_front(std::make_pair(output, static_cast<LineType>(level)));
-
-                if (this->scrollPosition_)
-                    this->scrollPosition_++;
-                else
-                    this->scrollIterator_ = this->outputLines_.begin();
-
-                this->bFinishedLastLine_ = newline;
-
-                if (!this->scrollPosition_)
-                {
-                    this->updateListeners<&ShellListener::lineAdded>();
-                }
-            }
+                this->addOutputLine(output, static_cast<LineType>(level));
             else
             {
                 this->outputLines_.front().first += output;
-                this->bFinishedLastLine_ = newline;
                 this->updateListeners<&ShellListener::onlyLastLineChanged>();
             }
+            this->bFinishedLastLine_ = newline;
 
         } while (newline);