mirror/OpenSpace
1
0
Fork 0
mirror of https://github.com/OpenSpace/OpenSpace.git synced 2026-01-04 02:29:49 -06:00
Code Issues Packages Projects Releases Wiki Activity

Prevent crash when trying to set UIntProperties using Number type (closes #2720)

Browse Source
This commit is contained in:
Alexander Bock
2023-06-01 09:26:41 +02:00
parent ea5ab3835d
commit 0c49bcf027
2 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/openspace/properties/scalar/uintproperty.h
View File

@@ -45,6 +45,9 @@ public:
int typeLua() const override;
using TemplateProperty<unsigned int>::operator=;
private:
unsigned int fromLuaConversion(lua_State* state) const override;
};
} // namespace openspace::properties

12
src/properties/scalar/uintproperty.cpp
View File

@@ -48,4 +48,16 @@ int UIntProperty::typeLua() const {
return LUA_TNUMBER;
}
unsigned int UIntProperty::fromLuaConversion(lua_State* state) const {
if (ghoul::lua::hasValue<double>(state)) {
return static_cast<int>(ghoul::lua::value<double>(state));
}
else if (ghoul::lua::hasValue<unsigned int>(state)) {
return ghoul::lua::value<unsigned int>(state);
}
else {
throw ghoul::RuntimeError(fmt::format("Error extracting value in UIntProperty"));
}
}
} // namespace openspace::properties