fix Command + A crashing

SpaghettDev · Dec 1, 2024 · 0b468f9 · 0b468f9
1 parent ba0d385
commit 0b468f9
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/src/macos.mm b/src/macos.mm
@@ -96,15 +96,11 @@ void keyDownExec(EAGLView* self, SEL sel, NSEvent* event) {
 
 	if (
 		![event isARepeat] &&
-		!BI::platform::keyDown(BI::PlatformKey::LEFT_CONTROL, event) &&
-		BI::platform::keyDown(BI::PlatformKey::LEFT_SHIFT, event)
+		BI::platform::keyDown(BI::PlatformKey::LEFT_CONTROL, event) &&
+		!BI::platform::keyDown(BI::PlatformKey::LEFT_SHIFT, event)
 	) {
 		switch ([event keyCode])
 		{
-			case kVK_Delete:
-			case kVK_ForwardDelete:
-				return g_selectedInput->onDelete(true, [event keyCode] == kVK_ForwardDelete);
-
 			case 'a': case 'A':
 				return g_selectedInput->highlightFromToPos(0, -1);
 
@@ -117,6 +113,10 @@ void keyDownExec(EAGLView* self, SEL sel, NSEvent* event) {
 			case 'x': case 'X':
 				return g_selectedInput->onCut();
 
+			case kVK_Delete:
+			case kVK_ForwardDelete:
+				return g_selectedInput->onDelete(true, [event keyCode] == kVK_ForwardDelete);
+
 			default:
 				break;
 		}
@@ -152,12 +152,10 @@ void keyDownExec(EAGLView* self, SEL sel, NSEvent* event) {
 void keyUpExec(EAGLView* self, SEL sel, NSEvent* event) {
 	if (!g_selectedInput)
 		return keyUpExecOIMP(self, sel, event);
-
-	geode::log::debug("key released ({})", [event keyCode]);
 }
 
 
-// TODO: move to hooking mouseDownExec
+// TODO: move to hooking mouseDownExec/mouseUpExec
 // handles mouse clicks
 struct BetterTouchDispatcher : geode::Modify<BetterTouchDispatcher, cocos2d::CCTouchDispatcher>
 {
@@ -167,8 +165,6 @@ void touches(cocos2d::CCSet* touches, cocos2d::CCEvent* event, unsigned int type
 		if (!g_selectedInput)
 			return cocos2d::CCTouchDispatcher::touches(touches, event, type);
 
-		geode::log::debug("button clicked");
-
 		auto* touch = static_cast<cocos2d::CCTouch*>(touches->anyObject());
 		const auto touchPos = touch->getLocation();