matthew/The-Powder-Toy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix occasional crashes upon opening settings

Browse Source 
By zero-initializing pointers in OptionsView so they don't crash when they don't get initialized, which up until very recently they always had. In the cases of the emscripten and android ports, certain components are never created.
This commit is contained in:
Tamás Bálint Misius 2023-10-04 19:31:58 +02:00
parent 8cfe7cdd93
commit 1a8ebd0981
No known key found for this signature in database
GPG Key ID: 5B472A12F6ECA9F2
1 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/gui/options/OptionsView.h
View File

@ -15,31 +15,31 @@ class OptionsModel;
class OptionsController;
class OptionsView: public ui::Window
{
OptionsController * c;
ui::Checkbox * heatSimulation;
ui::Checkbox * ambientHeatSimulation;
ui::Checkbox * newtonianGravity;
ui::Checkbox * waterEqualisation;
ui::DropDown * airMode;
ui::Textbox * ambientAirTemp;
ui::Button * ambientAirTempPreview;
ui::DropDown * gravityMode;
ui::DropDown * edgeMode;
ui::DropDown * temperatureScale;
ui::DropDown * scale;
ui::Checkbox * resizable;
ui::Checkbox * fullscreen;
ui::Checkbox * changeResolution;
ui::Checkbox * forceIntegerScaling;
ui::Checkbox * fastquit = nullptr;
ui::DropDown * decoSpace;
ui::Checkbox * showAvatars;
ui::Checkbox * momentumScroll;
ui::Checkbox * mouseClickRequired;
ui::Checkbox * includePressure;
ui::Checkbox * perfectCircle;
ui::Checkbox * graveExitsConsole;
ui::ScrollPanel * scrollPanel;
OptionsController *c{};
ui::Checkbox *heatSimulation{};
ui::Checkbox *ambientHeatSimulation{};
ui::Checkbox *newtonianGravity{};
ui::Checkbox *waterEqualisation{};
ui::DropDown *airMode{};
ui::Textbox *ambientAirTemp{};
ui::Button *ambientAirTempPreview{};
ui::DropDown *gravityMode{};
ui::DropDown *edgeMode{};
ui::DropDown *temperatureScale{};
ui::DropDown *scale{};
ui::Checkbox *resizable{};
ui::Checkbox *fullscreen{};
ui::Checkbox *changeResolution{};
ui::Checkbox *forceIntegerScaling{};
ui::Checkbox *fastquit{};
ui::DropDown *decoSpace{};
ui::Checkbox *showAvatars{};
ui::Checkbox *momentumScroll{};
ui::Checkbox *mouseClickRequired{};
ui::Checkbox *includePressure{};
ui::Checkbox *perfectCircle{};
ui::Checkbox *graveExitsConsole{};
ui::ScrollPanel *scrollPanel{};
float customGravityX, customGravityY;
void UpdateAmbientAirTempPreview(float airTemp, bool isValid);
void AmbientAirTempToTextBox(float airTemp);