Merge pull request #14299 from wordpress-mobile/issue/1965-take-a-pho…

…to-failure
wordpress-mobile · Jun 16, 2020 · 10cfc87 · 10cfc87
2 parents c43ba2d + f8e596f
commit 10cfc87
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/RELEASE-NOTES.txt b/RELEASE-NOTES.txt
@@ -16,6 +16,7 @@
 * [*] Fixed a bug where the "Publish a post" Quick Start tour didn't reflect the app's new information architecture 
 * [***] Free GIFs can now be added to the media library, posts, and pages.
 * [**] You can now set pages as your site's homepage or posts page directly from the Pages list.
+* [*] Block editor: Fix 'Take a Photo' option failing after adding an image to gallery block
 
 15.0
 -----

diff --git a/WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaPickerHelper.swift b/WordPress/Classes/ViewRelated/Gutenberg/GutenbergMediaPickerHelper.swift
@@ -16,7 +16,7 @@ class GutenbergMediaPickerHelper: NSObject {
 
     fileprivate let post: AbstractPost
     fileprivate unowned let context: UIViewController
-    fileprivate unowned var navigationPicker: WPNavigationMediaPickerViewController?
+    fileprivate weak var navigationPicker: WPNavigationMediaPickerViewController?
     fileprivate let noResultsView = NoResultsViewController.controller()
 
     /// Media Library Data Source
@@ -104,6 +104,7 @@ class GutenbergMediaPickerHelper: NSObject {
         cameraPicker.modalPresentationStyle = .currentContext
         cameraPicker.viewControllerToUseToPresent = context
         cameraPicker.options.filter = filter
+        cameraPicker.options.allowMultipleSelection = false
         cameraPicker.showCapture()
     }
 }