From 2a9dbd6e3c1334ec3b6774bbfddec8eb49da03eb Mon Sep 17 00:00:00 2001 From: Gridcoin Date: Thu, 11 Jun 2015 15:17:07 -0500 Subject: [PATCH] 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 | 2 +- Makefile.Release | 2 +- src/clientversion.h | 2 +- src/main.cpp | 10 ++++++---- src/qt/bitcoingui.cpp | 13 ------------- 5 files changed, 9 insertions(+), 20 deletions(-) diff --git a/Makefile.Debug b/Makefile.Debug index ee6bdc187e..3996e642a9 100644 --- a/Makefile.Debug +++ b/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 ############################################################################# diff --git a/Makefile.Release b/Makefile.Release index 79b3352ba8..46800efa11 100644 --- a/Makefile.Release +++ b/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 ############################################################################# diff --git a/src/clientversion.h b/src/clientversion.h index 72a5914976..e8467f0c82 100644 --- a/src/clientversion.h +++ b/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! diff --git a/src/main.cpp b/src/main.cpp index 3c8436190e..18bee071ed 100644 --- a/src/main.cpp +++ b/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; } diff --git a/src/qt/bitcoingui.cpp b/src/qt/bitcoingui.cpp index 67c6c33c73..482fe725e1 100644 --- a/src/qt/bitcoingui.cpp +++ b/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(...) - { - - } }