Hide menu window when vc dismisses.

Normally this isn't possible, just being paranoid.

// FREEBIE
pull/1/head
Michael Kirk 7 years ago
parent 82fdd5b883
commit dde2fd6f33

@ -1206,6 +1206,8 @@ typedef enum : NSUInteger {
[super viewWillDisappear:animated]; [super viewWillDisappear:animated];
self.isViewCompletelyAppeared = NO; self.isViewCompletelyAppeared = NO;
[[OWSWindowManager sharedManager] hideMenuActionsWindow];
} }
- (void)viewDidDisappear:(BOOL)animated - (void)viewDidDisappear:(BOOL)animated
@ -2558,9 +2560,6 @@ typedef enum : NSUInteger {
[self dismissViewControllerAnimated:NO completion:nil]; [self dismissViewControllerAnimated:NO completion:nil];
} }
// TODO override dismissViewController to dismiss any presented MessagesActionSheet?
// e.g. if we have any remaining dismiss-and-present logic remaining?
#pragma mark - CNContactViewControllerDelegate #pragma mark - CNContactViewControllerDelegate
- (void)contactViewController:(CNContactViewController *)viewController - (void)contactViewController:(CNContactViewController *)viewController

@ -269,6 +269,8 @@ const UIWindowLevel UIWindowLevel_MessageActions(void)
- (void)showMenuActionsWindow:(UIViewController *)menuActionsViewController - (void)showMenuActionsWindow:(UIViewController *)menuActionsViewController
{ {
OWSAssert(self.menuActionsViewController == nil);
self.menuActionsViewController = menuActionsViewController; self.menuActionsViewController = menuActionsViewController;
self.menuActionsWindow.rootViewController = menuActionsViewController; self.menuActionsWindow.rootViewController = menuActionsViewController;

Loading…
Cancel
Save