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

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;

ui.cpp

@@ -1929,6 +1929,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();
 
@@ -1992,6 +1995,7 @@ void CSendDialog::OnButtonSend(wxCommandEvent& event)
                 SetAddressBookName(strAddress, "");
 
         EndModal(true);
+    }
 }
 
 void CSendDialog::OnButtonCancel(wxCommandEvent& event)