From 11ec9b320eccf08aa5080989b2a510565cd26bbf Mon Sep 17 00:00:00 2001
From: Kyle Spearrin <kyle.spearrin@gmail.com>
Date: Mon, 3 Jun 2019 13:53:36 -0400
Subject: [PATCH] proper type for push reg date on migration

---
 src/App/Migration/MigrationHelpers.cs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/App/Migration/MigrationHelpers.cs b/src/App/Migration/MigrationHelpers.cs
index a6dba90e5..87e051e52 100644
--- a/src/App/Migration/MigrationHelpers.cs
+++ b/src/App/Migration/MigrationHelpers.cs
@@ -20,7 +20,7 @@ namespace Bit.App.Migration
 
         public static async Task<bool> PerformMigrationAsync()
         {
-            if(!NeedsMigration())
+            if(!NeedsMigration() || Migrating)
             {
                 return false;
             }
@@ -112,7 +112,7 @@ namespace Bit.App.Migration
                 settingsShim.GetValueOrDefault("push:registeredToken", null));
             Log("Migrating 6.9");
             await storageService.SaveAsync(Constants.PushLastRegistrationDateKey,
-                settingsShim.GetValueOrDefault("push:lastRegistrationDate", null));
+                settingsShim.GetValueOrDefault("push:lastRegistrationDate", DateTime.MinValue));
             Log("Migrating 6.10");
             await storageService.SaveAsync("rememberedEmail",
                 settingsShim.GetValueOrDefault("other:lastLoginEmail", null));