Changeset 6350 for code/branches

Timestamp:

Dec 14, 2009, 1:03:27 AM (15 years ago)

Author:

rgrieder

Message:

IOConsole should not process input during destruction.

File:

• code/branches/presentation2/src/libraries/core/IOConsole.cc (modified) (3 diffs)

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

@@ -121 +121 @@
     IOConsole::~IOConsole()
     {
-        // Empty all buffers
-        this->preUpdate(Game::getInstance().getGameClock());
+        // Process output written to std::cout in the meantime
+        std::cout.flush();
+        if (!this->origCout_.str().empty())
+            this->shell_->addOutputLine(this->origCout_.str(), Shell::None);
         // Erase input and status lines
         this->cout_ << "\033[1G\033[J";
@@ -504 +506 @@
     IOConsole::~IOConsole()
     {
+        // Process output written to std::cout in the meantime
+        std::cout.flush();
+        if (!this->origCout_.str().empty())
+            this->shell_->addOutputLine(this->origCout_.str(), Shell::None);
+
         this->shell_->unregisterListener(this);
-        // Empty all buffers
-        this->preUpdate(Game::getInstance().getGameClock());
 
         // Erase input and status lines
@@ -594 +599 @@
 
         // Process output written to std::cout
+        std::cout.flush();
         if (!this->origCout_.str().empty())
         {