Changeset 7342 in orxonox.OLD for trunk/src

Timestamp:

Apr 19, 2006, 4:08:09 AM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: ShellBuffer and ShellInput had the segfault-capability for years, now they have not anymore

Location:

trunk/src/lib

Files:

• graphics/render2D/element_2d.cc (modified) (2 diffs)
• shell/shell.cc (modified) (2 diffs)
• shell/shell_input.cc (modified) (1 diff)

trunk/src/lib/graphics/render2D/element_2d.cc

@@ -180 +180 @@
 
 /**
- * sets the alignment of the 2D-element in form of a String
+ * @brief sets the alignment of the 2D-element in form of a String
  * @param alignment the alignment @see loadParams
 */
@@ -221 +221 @@
 
 /**
- * sets the layer onto which this 2D-element is projected to.
+ * @brief sets the layer onto which this 2D-element is projected to.
  * @param layer the layer @see loadParams @see Element2D::charToLayer2D(const std::string& layer)
  */

trunk/src/lib/shell/shell.cc

@@ -337 +337 @@
   */
 
-  //   lastText->setRelCoor2D(this->calculateLinePosition(0));
-
   this->bufferText.front()->setText(text);
 }
@@ -381 +379 @@
   // redisplay the buffers
   list<std::string>::const_iterator it = this->bufferIterator;
+  if (it == ShellBuffer::getInstance()->getBuffer().end())
+  {
+    /// FIXME
+    PRINTF(1)("Should not heappen\n");
+    it--;
+  }
   for (std::list<Text*>::iterator textIt = this->bufferText.begin(); textIt != this->bufferText.end(); ++textIt)
   {
     (*textIt)->setText((*it));
+    if (it == ShellBuffer::getInstance()->getBuffer().begin())
+    {
+      /// FIXME
+      PRINTF(1)("Should not heappen\n");
+      break;
+    }
     it--;
   }

trunk/src/lib/shell/shell_input.cc

@@ -229 +229 @@
   if (!this->historyScrolling)
     return;
-  if (this->historyIT != this->history.end())
+  if (!this->history.empty() && this->historyIT != --this->history.end())
   {
     std::string nextElem = *(++this->historyIT);