Fixes for #83 and #82 (#84)

* Fixes for #83 and #82 * Chaged it so row.value is set only Once
EurekaCommunity · Oct 21, 2020 · 9e87f2c · 9e87f2c
1 parent b1f9f0c
commit 9e87f2c
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/Sources/ImagePickerController.swift b/Sources/ImagePickerController.swift
@@ -56,9 +56,17 @@ open class ImagePickerController: UIImagePickerController, TypedRowControllerTyp
 
     open func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) {
         (row as? ImagePickerProtocol)?.imageURL = info[UIImagePickerController.InfoKey.referenceURL] as? URL
-        (row as? ImagePickerProtocol)?.userPickerInfo = info
-        row.value = info[ (row as? ImagePickerProtocol)?.useEditedImage ?? false ? UIImagePickerController.InfoKey.editedImage : UIImagePickerController.InfoKey.originalImage] as? UIImage
+
+        var finalImage = info[UIImagePickerController.InfoKey.originalImage] as? UIImage
 
+        let editedImage = info[UIImagePickerController.InfoKey.editedImage] as? UIImage
+
+        if(((row as? ImagePickerProtocol)?.useEditedImage ?? false) && editedImage != nil) {
+            finalImage = editedImage
+        }
+
+        (row as? ImagePickerProtocol)?.userPickerInfo = info
+        row.value = finalImage
         onDismissCallback?(self)
     }