fix issue #145, restore from db menu is stuck at disabled status when…

… display changed
kangyu-california · Feb 17, 2022 · 7c82aff · 7c82aff
1 parent 21787fe
commit 7c82aff
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/...ersistentWindows.Solution/Ninjacrab.PersistentWindows.Common/PersistentWindowProcessor.cs b/...ersistentWindows.Solution/Ninjacrab.PersistentWindows.Common/PersistentWindowProcessor.cs
@@ -303,12 +303,12 @@ public bool Start(bool auto_restore_from_db = false)
                     restoreHalted = false;
                     topmostWindowsFixed.Clear();
 
-                    Log.Error("Restore aborted for {0}", curDisplayKey);
+                    Log.Trace("Restore aborted for {0}", curDisplayKey);
 
-                    // do restore again, while keeping previous capture time unchanged
                     curDisplayKey = displayKey;
                     if (normalSessions.Contains(curDisplayKey))
                     {
+                        // do restore again, while keeping previous capture time unchanged
                         Log.Event("Restart restore for {0}", curDisplayKey);
                         restoringFromMem = true;
                         StartRestoreTimer();
@@ -483,10 +483,9 @@ public bool Start(bool auto_restore_from_db = false)
                                 windowActiveCnt[curDisplayKey] = 0;
 
                             // change display on the fly
-                            curDisplayKey = displayKey;
-
-                            if (normalSessions.Contains(curDisplayKey))
+                            if (normalSessions.Contains(displayKey))
                             {
+                                curDisplayKey = displayKey;
                                 if (promptSessionRestore)
                                 {
                                     PromptSessionRestore();
@@ -496,7 +495,8 @@ public bool Start(bool auto_restore_from_db = false)
                             }
                             else
                             {
-                                Log.Error($"No need to restore {curDisplayKey} display session");
+                                //Log.Error($"No need to restore {curDisplayKey} display session");
+                                StartRestoreFinishedTimer(0);
                             }
                         }
                     }