Merge pull request #6728

laanwj · laanwj · commit 2b0567b00291 · 2015-09-29T08:44:15.000+02:00
9fea833 timedata: Prevent warning overkill (Wladimir J. van der Laan)
diff --git a/src/timedata.cpp b/src/timedata.cpp
@@ -99,9 +99,8 @@ void AddTimeData(const CNetAddr& ip, int64_t nOffsetSample)
                 if (!fMatch)
                 {
                     fDone = true;
-                    string strMessage = _("Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.");
+                    string strMessage = _("Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.");
                     strMiscWarning = strMessage;
-                    LogPrintf("*** %s\n", strMessage);
                     uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_WARNING);
                 }
             }

Original file line number	Diff line number	Diff line change
`@@ -99,9 +99,8 @@ void AddTimeData(const CNetAddr& ip, int64_t nOffsetSample)`
`99`	`99`	`if (!fMatch)`
`100`	`100`	`{`
`101`	`101`	`fDone = true;`
`102`		`- string strMessage = _("Warning: Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.");`
	`102`	`+ string strMessage = _("Please check that your computer's date and time are correct! If your clock is wrong Bitcoin Core will not work properly.");`
`103`	`103`	`strMiscWarning = strMessage;`
`104`		`- LogPrintf("*** %s\n", strMessage);`
`105`	`104`	`uiInterface.ThreadSafeMessageBox(strMessage, "", CClientUIInterface::MSG_WARNING);`
`106`	`105`	`}`
`107`	`106`	`}`