Merge branch 'mkirk/fix-movie-confirmation-preview' into hotfix/2.19.5

2018-01-19 15:34:24 -05:00 · 2018-01-19 15:34:24 -05:00 · 9ee293227d
commit 9ee293227d
parent 497b8b9605 3a5fa63cd6
1 changed files with 4 additions and 1 deletions
--- a/Signal/src/ViewControllers/MediaDetailViewController.m
+++ b/Signal/src/ViewControllers/MediaDetailViewController.m
@ -355,7 +355,10 @@ NS_ASSUME_NONNULL_BEGIN

 - (void)updateFooterBarButtonItemsWithIsPlayingVideo:(BOOL)isPlayingVideo
 {
-    OWSAssert(self.footerBar);
+    if (!self.footerBar) {
+        DDLogVerbose(@"%@ No footer bar visible.", self.logTag);
+        return;
+    }

    NSMutableArray<UIBarButtonItem *> *toolbarItems = [NSMutableArray new];