Changeset 5335 in orxonox.OLD for trunk/src/lib/shell

Timestamp:

Oct 9, 2005, 1:27:58 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: more fool-proov loading of important paths (data and image)

File:

• trunk/src/lib/shell/shell.cc (modified) (5 diffs)

trunk/src/lib/shell/shell.cc

@@ -56 +56 @@
   this->setName("Shell");
 
-  // register the shell at the ShellBuffer
-  ShellBuffer::getInstance()->registerShell(this);
   // EVENT-Handler subscription of '`' to all States.
   EventHandler::getInstance()->subscribe(this, ES_ALL, SDLK_BACKQUOTE);
@@ -82 +80 @@
 
   this->rebuildText();
+
+  // register the shell at the ShellBuffer
+  ShellBuffer::getInstance()->registerShell(this);
 }
 
@@ -89 +90 @@
 Shell::~Shell ()
 {
+  ShellBuffer::getInstance()->unregisterShell(this);
+
   // delete the displayable Buffers
   for (unsigned int i = 0; i < this->bufferDisplaySize; i++)
@@ -97 +100 @@
   // delete the inputLine
   delete this->shellInput;
-
-  ShellBuffer::getInstance()->unregisterShell(this);
 }
 
@@ -158 +159 @@
 void Shell::setFont(const char* fontFile)
 {
+//   if (!ResourceManager::isInDataDir(fontFile))
+//     return false;
+
   if (this->fontFile != NULL)
     delete[] this->fontFile;