twisterarmy/twister-core
1
0
Fork 0
mirror of https://github.com/twisterarmy/twister-core.git synced 2025-01-11 15:27:57 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Gavin Andresen 2010-11-03 20:24:50 -04:00
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() bool IsInitialBlockDownload()
{ {
if (pindexBest == NULL || nBestHeight < 74000) if (pindexBest == NULL || (!fTestNet && nBestHeight < 74000))
return true; return true;
static int64 nLastUpdate; static int64 nLastUpdate;
static CBlockIndex* pindexLastBest; static CBlockIndex* pindexLastBest;

4
ui.cpp
View File

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