Changeset 1755 for code/trunk/src/core/Shell.cc

Timestamp:

Sep 10, 2008, 1:37:36 AM (16 years ago)

Author:

rgrieder

Message:

merged gui back to trunk.
update the media repository!

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/core/Shell.cc (modified) (4 diffs)

code/trunk/src/core/Shell.cc

@@ -33 +33 @@
 #include "Core.h"
 #include "ConsoleCommand.h"
-#include "input/InputInterfaces.h"
 #include "util/OutputHandler.h"
 
@@ -64 +63 @@
         this->clearLines();
 
-        this->inputBuffer_ = 0;
-        this->setInputBuffer(new InputBuffer());
+        this->inputBuffer_ = new InputBuffer();
+        this->configureInputBuffer();
 
         this->outputBuffer_.registerListener(this);
@@ -71 +70 @@
 
         this->setConfigValues();
+    }
+
+    Shell::~Shell()
+    {
+        if (this->inputBuffer_)
+            delete this->inputBuffer_;
     }
 
@@ -113 +118 @@
     }
 
-    void Shell::setInputBuffer(InputBuffer* buffer)
-    {
-        if (this->inputBuffer_)
-        {
-            this->inputBuffer_->unregisterListener(this);
-            // TODO: may be very dangerous. InputManager already deletes InputBuffer instance!!!
-            delete this->inputBuffer_;
-        }
-
-        this->inputBuffer_ = buffer;
+    void Shell::configureInputBuffer()
+    {
         this->inputBuffer_->registerListener(this, &Shell::inputChanged, true);
         this->inputBuffer_->registerListener(this, &Shell::execute, '\r', false);