3.5.7.4-leisure

Gridcoin Research 3.5.7.4/MSI=40.9 Leisure Upgrade - Fix crash on startup when client has no blocks file.
gridcoin-community · Aug 14, 2016 · bbcbe27 · bbcbe27
1 parent 5849740
commit bbcbe27
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 11 deletions.
diff --git a/Makefile.Debug b/Makefile.Debug
@@ -1,5 +1,6 @@
 #############################################################################
 # Makefile for building: gridcoinresearch
+# Generated by qmake (2.01a) (Qt 4.8.4) on: Sun Aug 14 10:11:19 2016
 # Project:  gridcoinresearch.pro
 # Template: app
 #############################################################################

diff --git a/Makefile.Release b/Makefile.Release
@@ -1,5 +1,6 @@
 #############################################################################
 # Makefile for building: gridcoinresearch
+# Generated by qmake (2.01a) (Qt 4.8.4) on: Sun Aug 14 10:11:20 2016
 # Project:  gridcoinresearch.pro
 # Template: app
 #############################################################################

diff --git a/contrib/Installer/GridcoinInstaller/GridcoinResearch.vdproj b/contrib/Installer/GridcoinInstaller/GridcoinResearch.vdproj
@@ -232,19 +232,19 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_6408A3D03D15E306A4C3FC5FD95ADA69"
+        "OwnerKey" = "8:_D0966638AB084779AFD69795C33FC8EB"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_32F2DC723F30362B0B78F9A291EC0098"
+        "OwnerKey" = "8:_7A0EA93E644A4D9E8037FBB3C062DD65"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_DEB886DE05C496A5AD26B43C4B1B90B9"
+        "OwnerKey" = "8:_6AEABB5004EC4B57225B51B085DB5625"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
@@ -256,19 +256,19 @@
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_6AEABB5004EC4B57225B51B085DB5625"
+        "OwnerKey" = "8:_DEB886DE05C496A5AD26B43C4B1B90B9"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_7A0EA93E644A4D9E8037FBB3C062DD65"
+        "OwnerKey" = "8:_32F2DC723F30362B0B78F9A291EC0098"
         "MsmSig" = "8:_UNDEFINED"
         }
         "Entry"
         {
         "MsmKey" = "8:_UNDEFINED"
-        "OwnerKey" = "8:_D0966638AB084779AFD69795C33FC8EB"
+        "OwnerKey" = "8:_6408A3D03D15E306A4C3FC5FD95ADA69"
         "MsmSig" = "8:_UNDEFINED"
         }
     }
@@ -1095,19 +1095,19 @@
         {
         "Name" = "8:Microsoft Visual Studio"
         "ProductName" = "8:Gridcoin Research"
-        "ProductCode" = "8:{8F0D9F56-E672-4697-9504-A080E6B8C2F7}"
-        "PackageCode" = "8:{1A25A788-BCB1-4BDA-8385-43F08E751F91}"
+        "ProductCode" = "8:{D2E7B790-93C7-4435-AC13-D8EA7F24F1D4}"
+        "PackageCode" = "8:{121BC031-831C-40D8-9BE7-232F1D4D3E4D}"
         "UpgradeCode" = "8:{9617E9EA-252F-43CE-B53E-B48C85F71192}"
         "AspNetVersion" = "8:4.0.30319.0"
         "RestartWWWService" = "11:FALSE"
         "RemovePreviousVersions" = "11:TRUE"
         "DetectNewerInstalledVersion" = "11:FALSE"
         "InstallAllUsers" = "11:TRUE"
-        "ProductVersion" = "8:40.8"
+        "ProductVersion" = "8:40.9"
         "Manufacturer" = "8:GridcoinResearch"
         "ARPHELPTELEPHONE" = "8:"
         "ARPHELPLINK" = "8:"
-        "Title" = "8:Gridcoin Research 40.8"
+        "Title" = "8:Gridcoin Research 40.9"
         "Subject" = "8:"
         "ARPCONTACT" = "8:The Gridcoin Developers"
         "Keywords" = "8:Gridcoin Research"

diff --git a/src/clientversion.h b/src/clientversion.h
@@ -9,7 +9,7 @@
 #define CLIENT_VERSION_MAJOR       3
 #define CLIENT_VERSION_MINOR       5
 #define CLIENT_VERSION_REVISION    7
-#define CLIENT_VERSION_BUILD       3
+#define CLIENT_VERSION_BUILD       4
 
 // Converts the parameter X to a string after macro replacement on X has been performed.
 // Don't merge these into one macro!

diff --git a/src/main.cpp b/src/main.cpp
@@ -2808,6 +2808,7 @@ int64_t CTransaction::GetValueIn(const MapPrevTx& inputs) const
 
 double PreviousBlockAge()
 {
+    	if (nBestHeight < 10) return 99999;
 		if (IsLockTimeWithinMinutes(nLastCalculatedMedianTimePast,1))
 		{
 			return nLastBlockAge;