From 71af3fc5fbdf00a8a57e0f9047da3b333aa441a1 Mon Sep 17 00:00:00 2001 From: Damiano Galassi Date: Thu, 9 Aug 2018 08:49:05 +0200 Subject: [PATCH] MacGui: fix closing the add catagery window when presented as modal. --- macosx/HBAddCategoryController.m | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/macosx/HBAddCategoryController.m b/macosx/HBAddCategoryController.m index dd85ea4d7..598f70460 100644 --- a/macosx/HBAddCategoryController.m +++ b/macosx/HBAddCategoryController.m @@ -52,7 +52,15 @@ - (IBAction)dismiss:(id)sender { - [self.window.sheetParent endSheet:self.window returnCode:NSModalResponseCancel]; + if (self.window.isSheet) + { + [self.window.sheetParent endSheet:self.window returnCode:NSModalResponseCancel]; + } + else + { + [NSApp stopModalWithCode:NSModalResponseCancel]; + [self.window orderOut:self]; + } } - (IBAction)create:(id)sender @@ -60,7 +68,15 @@ self.category = [[HBPreset alloc] initWithCategoryName:self.name.stringValue builtIn:NO]; [self.manager addPreset:self.category]; - [self.window.sheetParent endSheet:self.window returnCode:NSModalResponseOK]; + if (self.window.isSheet) + { + [self.window.sheetParent endSheet:self.window returnCode:NSModalResponseOK]; + } + else + { + [NSApp stopModalWithCode:NSModalResponseOK]; + [self.window orderOut:self]; + } } -- 2.40.0