Changeset 1325 for code/branches/console/src/core

Timestamp:

May 19, 2008, 3:54:50 PM (17 years ago)

Author:

landauf

Message:

removed bug in ConfigValueContainer with default-vector with size zero (last attempt wasn't successful)

Location:

code/branches/console/src/core

Files:

• ConfigValueContainer.cc (modified) (2 diffs)
• ConfigValueContainer.h (modified) (1 diff)
• Shell.cc (modified) (1 diff)

code/branches/console/src/core/ConfigValueContainer.cc

@@ -87 +87 @@
 
         if (defvalue.size() > 0)
-            this->value_ = defvalue[0];
-
-        for (unsigned int i = 0; i < defvalue.size(); i++)
-            ConfigFileManager::getSingleton()->getValue(this->type_, this->sectionname_, this->varname_, i, defvalue[i].toString(), this->value_.isA(MT_string));
-
-        for (unsigned int i = 0; i < defvalue.size(); i++)
-            this->defvalueStringVector_.push_back(defvalue[i].toString());
-
-        this->update();
+        {
+                this->value_ = defvalue[0];
+
+            for (unsigned int i = 0; i < defvalue.size(); i++)
+            {
+                ConfigFileManager::getSingleton()->getValue(this->type_, this->sectionname_, this->varname_, i, defvalue[i].toString(), this->value_.isA(MT_string));
+                this->defvalueStringVector_.push_back(defvalue[i].toString());
+            }
+
+            this->update();
+        }
     }
 
@@ -282 +284 @@
             {
                 if (i < this->defvalueStringVector_.size())
+                {
                     this->value_.fromString(ConfigFileManager::getSingleton()->getValue(this->type_, this->sectionname_, this->varname_, i, this->defvalueStringVector_[i], this->value_.isA(MT_string)));
+                }
                 else
-                    this->value_.fromString(ConfigFileManager::getSingleton()->getValue(this->type_, this->sectionname_, this->varname_, i, MultiTypeMath(), this->value_.isA(MT_string)));
+                {
+                    this->value_.fromString(ConfigFileManager::getSingleton()->getValue(this->type_, this->sectionname_, this->varname_, i, "abc", this->value_.isA(MT_string)));
+                }
 
                 this->valueVector_.push_back(this->value_);

code/branches/console/src/core/ConfigValueContainer.h

@@ -94 +94 @@
             {
                 this->value_ = T();
+                this->update();
             }
 

code/branches/console/src/core/Shell.cc

@@ -80 +80 @@
         SetConfigValue(maxHistoryLength_, 100);
         SetConfigValue(historyOffset_, 0);
-        SetConfigValueVector(commandHistory_, std::vector<std::string>(1, ""));
+        SetConfigValueVector(commandHistory_, std::vector<std::string>());
 
         if (this->historyOffset_ >= this->maxHistoryLength_)