Actually fix the issue because my God I can't stand this anymore

hiimjasmine00 · Sep 3, 2024 · 8df4cb0 · 8df4cb0
1 parent c7633ef
commit 8df4cb0
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_OSX_ARCHITECTURES "x86_64;arm64")
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 
-project(IntegratedDemonlist VERSION 1.6.1)
+project(IntegratedDemonlist VERSION 1.6.2)
 
 add_library(${PROJECT_NAME} SHARED
     src/IDListLayer.cpp

diff --git a/changelog.md b/changelog.md
@@ -1,4 +1,7 @@
 # Integrated Demonlist Changelog
+## v1.6.2 (2024-09-03)
+- Actually fix the issue because my God I can't stand this anymore
+
 ## v1.6.1 (2024-09-02)
 - Fixed a bug where the enter key would not work at all
 

diff --git a/mod.json b/mod.json
@@ -5,7 +5,7 @@
         "win": "2.206",
         "mac": "2.206"
     },
-    "version": "v1.6.1",
+    "version": "v1.6.2",
     "id": "hiimjustin000.integrated_demonlist",
     "name": "Integrated Demonlist",
     "developer": "hiimjustin000",

diff --git a/src/main.cpp b/src/main.cpp
@@ -103,12 +103,16 @@ class $modify(IDKeyboardDispatcher, CCKeyboardDispatcher) {
     bool dispatchKeyboardMSG(enumKeyCodes key, bool down, bool repeat) {
         if (key == KEY_Enter && down) {
             auto listLayer = static_cast<IDListLayer*>(CCDirector::sharedDirector()->getRunningScene()->getChildByID("IDListLayer"));
-            if (listLayer) listLayer->search();
+            if (listLayer) {
+                listLayer->search();
+                return true;
+            }
 
             auto packLayer = static_cast<IDPackLayer*>(CCDirector::sharedDirector()->getRunningScene()->getChildByID("IDPackLayer"));
-            if (packLayer) packLayer->search();
-
-            return listLayer || packLayer;
+            if (packLayer) {
+                packLayer->search();
+                return true;
+            }
         }
         else return CCKeyboardDispatcher::dispatchKeyboardMSG(key, down, repeat);
     }