zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

This commit is contained in:
Gavin Andresen 2010-11-03 20:24:50 -04:00
parent be7eecafd2 3b8848fa4e
commit de374ba6b1
2 changed files with 61 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
main.cpp
View File

@ -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;

4
ui.cpp
View File

@ -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)