From 01bf63f9736327f67766a5eca45964569e259ff0 Mon Sep 17 00:00:00 2001 From: Noah Nuebling Date: Mon, 29 Mar 2021 17:46:00 +0200 Subject: [PATCH] Removed old attemps at fixing @4332weizi 's problem where they couldn't close the AddWindow. --- App/AddWindow/AddWindowController.m | 4 +--- App/SupportFiles/Info.plist | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/App/AddWindow/AddWindowController.m b/App/AddWindow/AddWindowController.m index ded0664e3..9fc4cdf53 100644 --- a/App/AddWindow/AddWindowController.m +++ b/App/AddWindow/AddWindowController.m @@ -28,6 +28,7 @@ @implementation AddWindowController static BOOL _pointerIsInsideAddField; // Init + (void)initialize { + // This initialize function was apparently called twice (but weirdly only on some machines) leading to issues. See https://github.com/noah-nuebling/mac-mouse-fix/pull/80 static dispatch_once_t onceToken; dispatch_once(&onceToken, ^{ _instance = [[AddWindowController alloc] initWithWindowNibName:@"AddWindow"]; @@ -65,9 +66,6 @@ + (void)begin { } + (void)end { [AppDelegate.mainWindow endSheet:_instance.window]; - // @4332weizi had trouble closing the window. I have now clue why. Maybe using this v instead of just this ^ helps. - [_instance.window close]; - [_instance.window orderOut:nil]; } + (void)handleReceivedAddModeFeedbackFromHelperWithPayload:(NSDictionary *)payload { // Tint plus icon to give visual feedback diff --git a/App/SupportFiles/Info.plist b/App/SupportFiles/Info.plist index 581363076..a775af876 100644 --- a/App/SupportFiles/Info.plist +++ b/App/SupportFiles/Info.plist @@ -19,7 +19,7 @@ CFBundleShortVersionString $(MARKETING_VERSION) CFBundleVersion - 5077 + 5078 LSApplicationCategoryType public.app-category.utilities NSHumanReadableCopyright