--- a/gui/src/OctaveLink.cpp	Wed Jul 20 22:53:46 2011 +0200
+++ b/gui/src/OctaveLink.cpp	Wed Jul 20 23:32:19 2011 +0200
@@ -132,9 +132,6 @@
   int serverHistoryLength = command_history::length ();
 
   // If were behind the server, iterate through all new entries and add them to our history.
-
-  // TODO: command_history::get_entry crashes, find out why.
-  /*
   if (clientHistoryLength < serverHistoryLength)
     {
       for (int i = clientHistoryLength; i < serverHistoryLength; i++)
@@ -142,7 +139,7 @@
           m_historyModel->insertRow (0);
           m_historyModel->setData (m_historyModel->index (0), QString (command_history::get_entry (i).c_str ()));
         }
-    }*/
+    }
 }
 
 QStringListModel *