Merge pull request #19 from Cvolton/controller-crash

Fix crash when controller stick is held on startup
geode-sdk · Oct 28, 2023 · 2c98573 · 2c98573
2 parents d9ffbdf + 2fad842
commit 2c98573
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 0 deletions.
diff --git a/src/DevTools.cpp b/src/DevTools.cpp
@@ -24,6 +24,10 @@ bool DevTools::pausedGame() const {
     return m_pauseGame;
 }
 
+bool DevTools::isSetup() const {
+    return m_setup;
+}
+
 CCNode* DevTools::getSelectedNode() const {
     return m_selectedNode;
 }

diff --git a/src/DevTools.hpp b/src/DevTools.hpp
@@ -71,6 +71,7 @@ class DevTools {
 
     bool shouldPopGame() const;
     bool pausedGame() const;
+    bool isSetup() const;
 
     CCNode* getSelectedNode() const;
     void selectNode(CCNode* node);

diff --git a/src/backend.cpp b/src/backend.cpp
@@ -141,6 +141,8 @@ static float SCROLL_SENSITIVITY = 10;
 
 class $modify(CCMouseDispatcher) {
     bool dispatchScrollMSG(float y, float x) {
+        if(!DevTools::get()->isSetup()) return true;
+
         auto& io = ImGui::GetIO();
         io.AddMouseWheelEvent(x / SCROLL_SENSITIVITY, -y / SCROLL_SENSITIVITY);