fix openssl linkage problems,
disable minimize to tray on Linux because it has too many problems including a CPU peg bug git-svn-id: https://bitcoin.svn.sourceforge.net/svnroot/bitcoin/trunk@103 1a98c847-1fd6-4fd8-948a-caf3550aa51b
This commit is contained in:
5
main.cpp
5
main.cpp
@@ -2610,6 +2610,9 @@ void BitcoinMiner()
|
||||
CTransaction& tx = (*mi).second;
|
||||
if (tx.IsCoinBase() || !tx.IsFinal())
|
||||
continue;
|
||||
unsigned int nTxSize = ::GetSerializeSize(tx, SER_NETWORK);
|
||||
if (nBlockSize + nTxSize >= MAX_BLOCK_SIZE - 10000)
|
||||
continue;
|
||||
|
||||
// Transaction fee based on block size
|
||||
int64 nMinFee = tx.GetMinFee(nBlockSize);
|
||||
@@ -2620,7 +2623,7 @@ void BitcoinMiner()
|
||||
swap(mapTestPool, mapTestPoolTmp);
|
||||
|
||||
pblock->vtx.push_back(tx);
|
||||
nBlockSize += ::GetSerializeSize(tx, SER_NETWORK);
|
||||
nBlockSize += nTxSize;
|
||||
vfAlreadyAdded[n] = true;
|
||||
fFoundSomething = true;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user