+ fix Enumeration::contains: the current index is irrelevant when searching for an entry in the enumeration
+ only print a warning if the enumeration is not empty but the restored index is < 0
This commit is contained in:
@@ -220,7 +220,7 @@ bool Enumeration::contains(const char *value) const
|
||||
// using string methods without set, use setEnums(const char** plEnums) first!
|
||||
//assert(_EnumArray);
|
||||
|
||||
if (!isValid()) {
|
||||
if (!getEnums()) {
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@@ -432,7 +432,9 @@ void PropertyEnumeration::Restore(Base::XMLReader &reader)
|
||||
}
|
||||
|
||||
if (val < 0) {
|
||||
Base::Console().Warning("Enumeration index %d is out of range, ignore it\n", val);
|
||||
// If the enum is empty at this stage do not print a warning
|
||||
if (_enum.getEnums())
|
||||
Base::Console().Warning("Enumeration index %d is out of range, ignore it\n", val);
|
||||
val = getValue();
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user