Skip to content

Fix default variable string value being empty instead of 0 #8473

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ClementPasteau wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −2
Open

Fix default variable string value being empty instead of 0 #8473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Core/GDCore/Project/Variable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,7 @@ void Variable::UnserializeFrom(const SerializerElement& element) {

if (IsPrimitive(type)) {
if (type == Type::String) {
SetString(element.GetStringAttribute("value", "0", "Value"));
SetString(element.GetStringAttribute("value", "", "Value"));
} else if (type == Type::Number) {
SetValue(element.GetDoubleAttribute("value", 0.0, "Value"));
} else if (type == Type::Boolean) {
Expand Down
2 changes: 1 addition & 1 deletion GDJS/Runtime/variable.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ namespace gdjs {
// Protect against NaN.
if (this._value !== this._value) this._value = 0;
} else if (this._type === 'string') {
this._str = '' + varData.value || '0';
this._str = varData.value !== undefined ? '' + varData.value : '';
} else if (this._type === 'boolean') {
this._bool = !!varData.value;
} else if (this._type === 'structure') {
Expand Down
9 changes: 9 additions & 0 deletions newIDE/app/src/VariablesList/VariablesList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1885,7 +1885,16 @@ const VariablesList: React.ComponentType<{
props.variablesContainer
);
if (!variable) return;
const oldType = variable.getType();
variable.castTo(newType);
// When changing type to String, reset to an empty string.
if (newType === 'string' && oldType === gd.Variable.Number) {
variable.setString('');
}
// When changing type to Number, reset to 0.
if (newType === 'number' && oldType === gd.Variable.String) {
variable.setValue(0);
}
_onChange();
forceUpdate();
},
Expand Down
Loading