misc exit code, updated setup.nsi

diff --git a/db.cpp b/db.cpp
index 1d68bef6555e6052c9fd65dd27975102d5ba928c..b21d1e3a216c06db2963f1799c5ba7fd8ad61f2d 100644 (file)
--- a/db.cpp
+++ b/db.cpp
@@ -637,6 +637,7 @@ bool CWalletDB::LoadWallet(vector<unsigned char>& vchDefaultKeyRet)
         pcursor->close();\r
     }\r
 \r
+    printf("nFileVersion = %d\n", nFileVersion);\r
     printf("fShowGenerated = %d\n", fShowGenerated);\r
     printf("fGenerateBitcoins = %d\n", fGenerateBitcoins);\r
     printf("nTransactionFee = %"PRI64d"\n", nTransactionFee);\r

diff --git a/net.cpp b/net.cpp
index 436a5abf7b96be8b06e3aec6dd4ee2bef48a81ef..941e7c4dc9c594ad377040c8f46934d7c291d6d2 100644 (file)
--- a/net.cpp
+++ b/net.cpp
@@ -929,7 +929,7 @@ void ThreadOpenConnections2(void* parg)
                 // Only try the old stuff if we don't have enough connections\r
                 if (vNodes.size() >= 2 && nSinceLastSeen > 7 * 24 * 60 * 60)\r
                     continue;\r
-                if (vNodes.size() >= 4 && nSinceLastSeen > 24 * 60 * 60)\r
+                if (vNodes.size() >= 5 && nSinceLastSeen > 24 * 60 * 60)\r
                     continue;\r
 \r
                 // If multiple addresses are ready, prioritize by time since\r
@@ -1256,11 +1256,14 @@ void StartNode(void* parg)
 \r
     //\r
     // Thread monitoring\r
+    // Not really needed anymore, the cause of the hanging was fixed\r
     //\r
     loop\r
     {\r
-        Sleep(15000);\r
-        if (GetTime() - nThreadSocketHandlerHeartbeat > 4 * 60)\r
+        Sleep(1000);\r
+        if (fShutdown)\r
+            return;\r
+        if (GetTime() - nThreadSocketHandlerHeartbeat > 15 * 60)\r
         {\r
             // First see if closing sockets will free it\r
             printf("*** ThreadSocketHandler is stopped ***\n");\r
@@ -1280,6 +1283,8 @@ void StartNode(void* parg)
                 }\r
             }\r
             Sleep(10000);\r
+            if (fShutdown)\r
+                return;\r
             if (GetTime() - nThreadSocketHandlerHeartbeat < 60)\r
                 continue;\r
 \r

diff --git a/serialize.h b/serialize.h
index 63291c6b74bb3fd2a02f1fadccc3ceecc020d709..8f925103b1552208b08e347234af6079729edefe 100644 (file)
--- a/serialize.h
+++ b/serialize.h
@@ -19,8 +19,8 @@ class CScript;
 class CDataStream;\r
 class CAutoFile;\r
 \r
-static const int VERSION = 106;\r
-static const char* pszSubVer = " test11";\r
+static const int VERSION = 200;\r
+static const char* pszSubVer = " rc1";\r
 \r
 \r
 \r

diff --git a/setup.nsi b/setup.nsi
index e30ff13cc430adec2e17d36010f8b89f15717d7b..a5a73366a3717fdcb847ee30fd5a5c9898485cac 100644 (file)
--- a/setup.nsi
+++ b/setup.nsi
@@ -7,12 +7,12 @@ RequestExecutionLevel highest
 \r
 # General Symbol Definitions\r
 !define REGKEY "SOFTWARE\$(^Name)"\r
-!define VERSION 0.1.6\r
+!define VERSION 0.2.0\r
 !define COMPANY "Bitcoin project"\r
-!define URL http://bitcoin.sourceforge.net/\r
+!define URL http://www.bitcoin.org/\r
 \r
 # MUI Symbol Definitions\r
-!define MUI_ICON "rc\bitcoin.ico"\r
+!define MUI_ICON "src\rc\bitcoin.ico"\r
 !define MUI_FINISHPAGE_NOAUTOCLOSE\r
 !define MUI_STARTMENUPAGE_REGISTRY_ROOT HKLM\r
 !define MUI_STARTMENUPAGE_REGISTRY_KEY ${REGKEY}\r
@@ -42,12 +42,12 @@ Var StartMenuGroup
 !insertmacro MUI_LANGUAGE English\r
 \r
 # Installer attributes\r
-OutFile Bitcoin_0.1.6_setup.exe\r
+OutFile bitcoin-0.2.0-setup.exe\r
 InstallDir $PROGRAMFILES\Bitcoin\r
 CRCCheck on\r
 XPStyle on\r
 ShowInstDetails show\r
-VIProductVersion 0.1.6.0\r
+VIProductVersion 0.2.0.0\r
 VIAddVersionKey ProductName Bitcoin\r
 VIAddVersionKey ProductVersion "${VERSION}"\r
 VIAddVersionKey CompanyName "${COMPANY}"\r
@@ -65,6 +65,11 @@ Section -Main SEC0000
     File bitcoin.exe\r
     File libeay32.dll\r
     File mingwm10.dll\r
+    File license.txt\r
+    File readme.txt\r
+    SetOutPath $INSTDIR\src\r
+    File /r src\*.*\r
+    SetOutPath $INSTDIR\r
     WriteRegStr HKCU "${REGKEY}\Components" Main 1\r
 SectionEnd\r
 \r
@@ -102,9 +107,12 @@ done${UNSECTION_ID}:
 \r
 # Uninstaller sections\r
 Section /o -un.Main UNSEC0000\r
-    Delete /REBOOTOK $INSTDIR\mingwm10.dll\r
-    Delete /REBOOTOK $INSTDIR\libeay32.dll\r
     Delete /REBOOTOK $INSTDIR\bitcoin.exe\r
+    Delete /REBOOTOK $INSTDIR\libeay32.dll\r
+    Delete /REBOOTOK $INSTDIR\mingwm10.dll\r
+    Delete /REBOOTOK $INSTDIR\license.txt\r
+    Delete /REBOOTOK $INSTDIR\readme.txt\r
+    RMDir /r /REBOOTOK $INSTDIR\src\r
     DeleteRegValue HKCU "${REGKEY}\Components" Main\r
 SectionEnd\r
 \r
@@ -114,6 +122,7 @@ Section -un.post UNSEC0001
     Delete /REBOOTOK "$SMPROGRAMS\$StartMenuGroup\Bitcoin.lnk"\r
     Delete /REBOOTOK "$SMSTARTUP\Bitcoin.lnk"\r
     Delete /REBOOTOK $INSTDIR\uninstall.exe\r
+    Delete /REBOOTOK $INSTDIR\debug.log\r
     Delete /REBOOTOK $INSTDIR\db.log\r
     DeleteRegValue HKCU "${REGKEY}" StartMenuGroup\r
     DeleteRegValue HKCU "${REGKEY}" Path\r
@@ -139,4 +148,3 @@ Function un.onInit
     !insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup\r
     !insertmacro SELECT_UNSECTION Main ${UNSEC0000}\r
 FunctionEnd\r
-\r

diff --git a/ui.cpp b/ui.cpp
index 262f2a883704360d995d56955b07470e43092eab..7432302854ec861815d01189ae5977dc89c5950a 100644 (file)
--- a/ui.cpp
+++ b/ui.cpp
@@ -394,6 +394,14 @@ CMainFrame::~CMainFrame()
     ptaskbaricon = NULL;\r
 }\r
 \r
+void ExitTimeout(void* parg)\r
+{\r
+#ifdef __WXMSW__\r
+    Sleep(5000);\r
+    ExitProcess(0);\r
+#endif\r
+}\r
+\r
 void Shutdown(void* parg)\r
 {\r
     static CCriticalSection cs_Shutdown;\r
@@ -404,6 +412,7 @@ void Shutdown(void* parg)
         fFirstThread = !fTaken;\r
         fTaken = true;\r
     }\r
+    static bool fExit;\r
     if (fFirstThread)\r
     {\r
         fShutdown = true;\r
@@ -411,13 +420,18 @@ void Shutdown(void* parg)
         DBFlush(false);\r
         StopNode();\r
         DBFlush(true);\r
+        CreateThread(ExitTimeout, NULL);\r
+        Sleep(10);\r
         printf("Bitcoin exiting\n\n");\r
+        fExit = true;\r
         exit(0);\r
     }\r
     else\r
     {\r
-        loop\r
-            Sleep(100000);\r
+        while (!fExit)\r
+            Sleep(500);\r
+        Sleep(100);\r
+        ExitThread(0);\r
     }\r
 }\r
 \r