Merge remote branch 'refs/remotes/svn/trunk' into svn

14 years ago · de374ba6b1
parent be7eecafd2 3b8848fa4e
commit de374ba6b1
2 changed files with 58 additions and 54 deletions
--- a/main.cpp
+++ b/main.cpp
@ -929,7 +929,7 @@ bool CheckProofOfWork(uint256 hash, unsigned int nBits)

 bool IsInitialBlockDownload()
 {
-    if (pindexBest == NULL || nBestHeight < 74000)
+    if (pindexBest == NULL || (!fTestNet && nBestHeight < 74000))
        return true;
    static int64 nLastUpdate;
    static CBlockIndex* pindexLastBest;
--- a/ui.cpp
+++ b/ui.cpp
@ -1928,6 +1928,9 @@ void CSendDialog::OnButtonPaste(wxCommandEvent& event)
 }

 void CSendDialog::OnButtonSend(wxCommandEvent& event)
+{
+    static CCriticalSection cs_sendlock;
+    TRY_CRITICAL_BLOCK(cs_sendlock)
    {
        CWalletTx wtx;
        string strAddress = (string)m_textCtrlAddress->GetValue();
@ -1993,6 +1996,7 @@ void CSendDialog::OnButtonSend(wxCommandEvent& event)

        EndModal(true);
    }
+}

 void CSendDialog::OnButtonCancel(wxCommandEvent& event)
 {