Skip to content

Commit

Permalink
potentially fix editor crash on android32
Browse files Browse the repository at this point in the history
  • Loading branch information
HJfod committed Feb 19, 2024
1 parent a8850eb commit 88ffe8b
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 3 deletions.
4 changes: 4 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@

## v6.3.2

* Disable grid size controls on 32-bit Android as the most likely source of a crash

## v6.3.1

* Fix crash when placing objects, as well as grid size not working
Expand Down
8 changes: 5 additions & 3 deletions mod.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"geode": "2.0.0-beta.20",
"version": "v6.3.1",
"version": "v6.3.2",
"gd": {
"win": "2.204",
"mac": "2.200",
Expand Down Expand Up @@ -102,13 +102,15 @@
"type": "bool",
"default": true,
"name": "Show Grid Size Controls",
"description": "Shows controls in the UI for adjusting the size of the grid. <cr>Requires re-entering the editor!</c>"
"description": "Shows controls in the UI for adjusting the size of the grid. <cr>Requires re-entering the editor!</c>",
"platforms": ["windows", "android64"]
},
"show-grid-on-size-change": {
"type": "bool",
"default": true,
"name": "Show Grid on Size Change",
"description": "If the grid is currently hidden and you use the controls to change its size, its toggled on"
"description": "If the grid is currently hidden and you use the controls to change its size, its toggled on",
"platforms": ["windows", "android64"]
}
}
}
4 changes: 4 additions & 0 deletions src/features/GridScaling.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@

using namespace geode::prelude;

#ifndef GEODE_IS_ANDROID32

class $modify(ObjectToolbox) {
$override
float gridNodeSizeForKey(int id) {
Expand Down Expand Up @@ -136,3 +138,5 @@ class $modify(GridUI, EditorUI) {
m_selectedMode = actualMode;
}
};

#endif

0 comments on commit 88ffe8b

Please sign in to comment.