Merge pull request 'gui: add a "Restart Now" button to the SQLite conversion wizard' (#63) from wallet-wizard-restart into main

1 files changed, 8 insertions, 0 deletions

diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index 6cd8b75..55ca8c6 100644
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -509,6 +509,14 @@ int main(int argc, char* argv[])
 
     ParseStartupArguments(argc, argv);
 
+#ifdef _WIN32
+    // Set by the GUI "Restart Now" button: give the previous instance a moment
+    // to release the network port and the block-index files before this one
+    // opens them, so a relaunch does not race the process it is replacing.
+    if (arg(argc, argv, "/restartwait") || arg(argc, argv, "-restartwait"))
+        Sleep(2500);
+#endif
+
     // Hidden self-test helper. It must run before LoadWallet(): several
     // storage-sanity scenarios deliberately make wallet.dat unsafe to load.
     string strSelfTestMutateWallet =