Check varialbe exists before call dismiss

heikotroetsch · Jan 25, 2018 · 8e92708 · 8e92708
1 parent fd00a83
commit 8e92708
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/Owncloud iOs Client/AppDelegate.m b/Owncloud iOs Client/AppDelegate.m
@@ -1764,7 +1764,7 @@ - (void) closeAlertViewAndViewControllers {
 
     if (self.presentFilesViewController){
         //Close the openWith option in FileViewController
-        if (self.presentFilesViewController.openWith) {
+        if (self.presentFilesViewController.openWith && self.presentFilesViewController.openWith.documentInteractionController) {
             [self.presentFilesViewController.openWith.documentInteractionController dismissMenuAnimated:NO];
             self.presentFilesViewController.openWith.documentInteractionController = nil;
         }

diff --git a/Owncloud iOs Client/Files/Preview/DetailView/DetailViewController.m b/Owncloud iOs Client/Files/Preview/DetailView/DetailViewController.m
@@ -844,9 +844,10 @@ - (void)presentWhiteView {
     self.view.backgroundColor = [UIColor colorOfBackgroundDetailViewiPad];
 
     _titleLabel.text = @"";
-
-    [_openWith.documentInteractionController dismissMenuAnimated:YES];
-
+    if (_openWith && _openWith.documentInteractionController) {
+        [_openWith.documentInteractionController dismissMenuAnimated:YES];
+    }
+
     [self removeThePreviousViews];
 
     _isFileCharged = NO;
@@ -1734,8 +1735,7 @@ - (void) customWillRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterf
         [self.readerPDFViewController willRotateToInterfaceOrientation:toInterfaceOrientation duration:duration];
     }
 
-    if (_openWith) {
-
+     if (_openWith && _openWith.documentInteractionController) {
         [_openWith.documentInteractionController dismissMenuAnimated:NO];
     }
 

diff --git a/Owncloud iOs Client/Tabs/FileTab/FilesViewController.m b/Owncloud iOs Client/Tabs/FileTab/FilesViewController.m
@@ -623,7 +623,7 @@ - (BOOL)shouldAutorotate {
 
 - (void)willRotateToInterfaceOrientation:(UIInterfaceOrientation)toInterfaceOrientation duration:(NSTimeInterval)duration{
 
-    if (self.openWith && !IS_IPHONE) {
+    if (self.openWith && self.openWith.documentInteractionController && !IS_IPHONE) {
         [self.openWith.documentInteractionController dismissMenuAnimated:NO];
     }