From 194c4bef4962db84cb301845dd1513ca07e14945 Mon Sep 17 00:00:00 2001
From: Michael Starke <michael.starke@hicknhack-software.com>
Date: Mon, 12 Nov 2018 19:03:49 +0100
Subject: [PATCH] Fixed issue with expiration date popup showing today instead
 of set date (fixes #845)

---
 MacPass/MPDatePickingViewController.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MacPass/MPDatePickingViewController.m b/MacPass/MPDatePickingViewController.m
index ef74ba45..1564c60d 100644
--- a/MacPass/MPDatePickingViewController.m
+++ b/MacPass/MPDatePickingViewController.m
@@ -68,7 +68,7 @@ typedef NS_ENUM(NSUInteger, MPDatePreset) {
     [presetMenu addItem:item];
   }
   
-  self.datePicker.dateValue = [NSDate date];
+  self.datePicker.dateValue = self.representedObject ? [self.representedObject timeInfo].expirationDate : NSDate.date;
   self.presetPopupButton.menu = presetMenu;
 }