From 2d6403572b3b6694a61c8524ea1a2c2acb2d44bc Mon Sep 17 00:00:00 2001
From: ZIlko <axeloxxd2@gmail.com>
Date: Fri, 10 Jan 2025 19:46:42 -0600
Subject: [PATCH] 2.3.3

---
 changelog.md              | 5 +++++
 mod.json                  | 2 +-
 src/hacks/other.cpp       | 6 +++---
 src/macro.cpp             | 6 ++++--
 src/macro.hpp             | 2 +-
 src/renderer/renderer.cpp | 2 ++
 src/ui/record_layer.cpp   | 3 ---
 7 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/changelog.md b/changelog.md
index 8405adb..0246dd5 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,8 @@
+# v2.3.3
+
+* Fixed android render inputs length being limited to 3 or 2 idk.
+* Fixed macro autosaving on level end even if autosave was not enabled.
+
 # v2.3.2
 
 * Fixed android default render codec.
diff --git a/mod.json b/mod.json
index 0919d17..2db14ad 100644
--- a/mod.json
+++ b/mod.json
@@ -4,7 +4,7 @@
 		"win": "2.2074",
 		"android": "2.2074"
 	},
-	"version": "2.3.2",
+	"version": "2.3.3",
 	"id": "zilko.xdbot",
 	"name": "xdBot",
 	"developer": "Zilko",
diff --git a/src/hacks/other.cpp b/src/hacks/other.cpp
index f4479fa..a7c5aeb 100644
--- a/src/hacks/other.cpp
+++ b/src/hacks/other.cpp
@@ -170,7 +170,7 @@ class $modify(EndLevelLayer) {
         EndLevelLayer::customSetup();
         auto& g = Global::get();
 
-        if (g.mod->getSavedValue<bool>("autosave_levelend_enabled"))
+        if (g.state == state::recording && g.autosaveEnabled && g.mod->getSavedValue<bool>("autosave_levelend_enabled"))
             Macro::autoSave(nullptr, g.currentSession);
 
         if (g.mod->getSettingValue<bool>("endscreen_button")) {
@@ -182,8 +182,8 @@ class $modify(EndLevelLayer) {
         	CCMenuItemSpriteExtra* btn = CCMenuItemSpriteExtra::create(
                 sprite,
 			    this,
-			    menu_selector(RecordLayer::openMenu2
-            ));
+			    menu_selector(RecordLayer::openMenu2)
+            );
 			btn->setPosition({160, -99});
 
 			CCLayer* layer = this->getChildByType<CCLayer>(0);
diff --git a/src/macro.cpp b/src/macro.cpp
index c84c2a5..fae5000 100644
--- a/src/macro.cpp
+++ b/src/macro.cpp
@@ -46,14 +46,16 @@ bool Macro::flipControls() {
 }
 
 void Macro::autoSave(GJGameLevel* level, int number) {
-    if (!level) level = PlayLayer::get() ? PlayLayer::get()->m_level : nullptr;
+    if (!level) level = PlayLayer::get() != nullptr ? PlayLayer::get()->m_level : nullptr;
     if (!level) return;
 
     std::string levelname = level->m_levelName;
     std::filesystem::path autoSavesPath = Mod::get()->getSettingValue<std::filesystem::path>("autosaves_folder");
     std::filesystem::path path = autoSavesPath / fmt::format("autosave_{}_{}", levelname, number);
 
-    std::string username = GJAccountManager::sharedState()->m_username;
+    if (!std::filesystem::exists(autoSavesPath)) return;
+
+    std::string username = GJAccountManager::sharedState() != nullptr ? GJAccountManager::sharedState()->m_username : "";
     int result = Macro::save(username, fmt::format("AutoSave {} in level {}", number, levelname), path.string());
 
     if (result != 0)
diff --git a/src/macro.hpp b/src/macro.hpp
index f28c8f7..499094f 100644
--- a/src/macro.hpp
+++ b/src/macro.hpp
@@ -17,7 +17,7 @@ const std::vector<float> safeValues = {
     1.0f / 5, 1.0f / 4, 1.0f / 3, 1.0f / 2
 };
 
-const std::string xdBotVersion = "v2.3.2";
+const std::string xdBotVersion = "v2.3.3";
 
 enum state {
     none,
diff --git a/src/renderer/renderer.cpp b/src/renderer/renderer.cpp
index 78ae0e6..d635553 100644
--- a/src/renderer/renderer.cpp
+++ b/src/renderer/renderer.cpp
@@ -381,6 +381,8 @@ void Renderer::start() {
 
         #ifdef GEODE_IS_ANDROID
         audioMode = AudioMode::Off;
+        #else
+        if (usingApi) audioMode = AudioMode::Off;
         #endif
 
         if ((SFXVolume == 0.f && musicVolume == 0.f) || audioMode == AudioMode::Off || (audioMode == AudioMode::Song && !std::filesystem::exists(songFile)) || (audioMode == AudioMode::Record && !std::filesystem::exists("fmodoutput.wav"))) {
diff --git a/src/ui/record_layer.cpp b/src/ui/record_layer.cpp
index 9e846ed..edeb91a 100644
--- a/src/ui/record_layer.cpp
+++ b/src/ui/record_layer.cpp
@@ -794,7 +794,6 @@ bool RecordLayer::setup() {
     heightInput->setMouseEnabled(true);
     heightInput->setContentSize({ 60, 20 });
     heightInput->setTouchEnabled(true);
-    heightInput->setMaxLabelLength(4);
     heightInput->setAllowedChars("0123456789");
     heightInput->setString(mod->getSavedValue<std::string>("render_height").c_str());
     heightInput->setDelegate(this);
@@ -811,7 +810,6 @@ bool RecordLayer::setup() {
     bitrateInput->setContentSize({ 32, 20 });
     bitrateInput->setTouchEnabled(true);
     bitrateInput->setAllowedChars("0123456789");
-    bitrateInput->setMaxLabelLength(3);
     bitrateInput->setString(mod->getSavedValue<std::string>("render_bitrate").c_str());
     bitrateInput->setDelegate(this);
     menu->addChild(bitrateInput);
@@ -870,7 +868,6 @@ bool RecordLayer::setup() {
     fpsInput->setMouseEnabled(true);
     fpsInput->setTouchEnabled(true);
     fpsInput->setContentSize({ 32, 20 });
-    fpsInput->setMaxLabelLength(3);
     fpsInput->setAllowedChars("0123456789");
     fpsInput->setString(mod->getSavedValue<std::string>("render_fps").c_str());
     fpsInput->setDelegate(this);