3.4.0.6

Gridcoin Research 3.4.0.6/24.5/356
Leisure Upgrade

- Merged Jiro's changes to make Mac compile
- Added more to debug crash issue reported by Quez & CM

Makefile.Debug

@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: gridcoinresearch
-# Generated by qmake (2.01a) (Qt 4.8.4) on: Thu Jun 11 11:02:25 2015
+# Generated by qmake (2.01a) (Qt 4.8.4) on: Thu Jun 11 15:13:59 2015
 # Project:  gridcoinstake.pro
 # Template: app
 #############################################################################

Makefile.Release

@@ -1,6 +1,6 @@
 #############################################################################
 # Makefile for building: gridcoinresearch
-# Generated by qmake (2.01a) (Qt 4.8.4) on: Thu Jun 11 11:02:26 2015
+# Generated by qmake (2.01a) (Qt 4.8.4) on: Thu Jun 11 15:13:59 2015
 # Project:  gridcoinstake.pro
 # Template: app
 #############################################################################

src/clientversion.h

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

src/main.cpp

@@ -3824,7 +3824,7 @@ void GridcoinServices()
 			printf(" {CPIDs Re-Loaded} ");
 	}
 
-	if (TimerMain("check_for_autoupgrade",60))
+	if (TimerMain("check_for_autoupgrade",240))
 	{
 		bCheckedForUpgradeLive = true;
 	}
@@ -3843,6 +3843,7 @@ void GridcoinServices()
 		bCheckedForUpgradeLive=false;
 		printf("{Checking for Upgrade} ");
 		CheckForUpgrade();
+		printf("{Done checking for upgrade} ");
 	}
 	#endif
 
@@ -4942,15 +4943,15 @@ bool TallyNetworkAverages(bool ColdBoot)
 		bNetAveragesLoaded = true;
 		return true;
 	}
-	if (fDebug) printf("Gathering network avgs (begin)\r\n");
+	printf("Gathering network avgs (begin)\r\n");
 	//If we did this within the last 10 mins, we are fine:
 	if (IsLockTimeWithinMinutes(nLastTallied,10)) return true;
 	nLastTallied = GetAdjustedTime();
 
 	bNetAveragesLoaded = false;
 	//Clear the neural network hash buffer
-	mvNeuralNetworkHash.clear();
-
+	if (mvNeuralNetworkHash.size() > 1)  mvNeuralNetworkHash.clear();
+	printf(".$1.");
 	LOCK(cs_main);
 	try 
 	{
@@ -5092,6 +5093,7 @@ bool TallyNetworkAverages(bool ColdBoot)
 		bNetAveragesLoaded=true;
 	}
 	bNetAveragesLoaded=true;
+	printf("2");
 	return false;
 
 }

src/qt/bitcoingui.cpp

@@ -615,8 +615,6 @@ int RebootClient()
 
 void CheckForUpgrade()
 {
-	try
-	{
 		    if (bCheckedForUpgrade == false && !fTestNet && bProjectsInitialized)
 			{
 				int nNeedsUpgrade = 0;
@@ -626,18 +624,7 @@ void CheckForUpgrade()
 				#endif
 				printf("Needs upgraded %f\r\n",(double)nNeedsUpgrade);
 				if (nNeedsUpgrade) UpgradeClient();
-
-
-
-
-
-
 			}
-	}
-	catch(...)
-	{
-
-	}
 }