Fix #24

Angelelz · Aug 24, 2019 · edf418a · edf418a
1 parent 1f3343b
commit edf418a
Showing 1 changed file with 16 additions and 13 deletions.
diff --git a/WinHelloUnlock/UWPLibrary.cs b/WinHelloUnlock/UWPLibrary.cs
@@ -369,20 +369,23 @@ internal static async Task UnlockDatabase(IOConnectionInfo ioInfo)
                 KeyList keyList = await RetrieveKeys(dbPath, retrievalResult);
 
                 CompositeKey compositeKey = Library.ConvertToComposite(keyList);
-                WinHelloUnlockExt.opened = true;
-                WinHelloUnlockExt.Host.MainWindow.OpenDatabase(ioInfo, compositeKey, true);
-                string oPath = Library.CharChange(WinHelloUnlockExt.Host.Database.IOConnectionInfo.Path);
-                if (oPath != dbPath)
+                ++WinHelloUnlockExt.tries;
+                if (compositeKey != null)
                 {
-                    string str = WinHelloUnlockExt.ProductName + " could not unlock this database." +
-                        " MasterKey may have changed. Delete " + WinHelloUnlockExt.ProductName + " data?";
-                    if (MessageService.AskYesNo(str, WinHelloUnlockExt.ShortProductName))
-                        DeleteHelloData(dbPath);
-                    WinHelloUnlockExt.Host.MainWindow.OpenDatabase(ioInfo, null, false);
-                }
-                compositeKey = null;
-
-                keyList = new KeyList(null, null);
+                    WinHelloUnlockExt.Host.MainWindow.OpenDatabase(ioInfo, compositeKey, true);
+                    string oPath = Library.CharChange(WinHelloUnlockExt.Host.Database.IOConnectionInfo.Path);
+                    if (oPath != dbPath)
+                    {
+                        string str = WinHelloUnlockExt.ProductName + " could not unlock this database." +
+                            " MasterKey may have changed. Delete " + WinHelloUnlockExt.ProductName + " data?";
+                        if (MessageService.AskYesNo(str, WinHelloUnlockExt.ShortProductName))
+                            DeleteHelloData(dbPath);
+                        WinHelloUnlockExt.Host.MainWindow.OpenDatabase(ioInfo, null, false);
+                    }
+                    compositeKey = null;
+
+                    keyList = new KeyList(null, null);
+                } else WinHelloUnlockExt.Host.MainWindow.OpenDatabase(ioInfo, null, false);
             }
             else
             {