v29 - ds disabled by default, fixed config saving

This commit is contained in:
Evan Duffield 2014-08-14 12:25:40 -07:00
parent 4192110ae2
commit e525a4d40f
3 changed files with 7 additions and 7 deletions

View File

@ -1166,7 +1166,7 @@ bool AppInit2(boost::thread_group& threadGroup)
}
}
fDisableDarksend = GetBoolArg("-disabledarksend", false);
fDisableDarksend = GetBoolArg("-disabledarksend", true);
bool fEnabledDaemonDarksend = GetBoolArg("-enabledaemondarksend", false);
if(fDaemon && !fEnabledDaemonDarksend) fDisableDarksend = true;

View File

@ -148,7 +148,7 @@
<string>Disable Darksend</string>
</property>
<property name="checked">
<bool>false</bool>
<bool>true</bool>
</property>
</widget>
</item>

View File

@ -103,7 +103,7 @@ bool OptionsModel::Upgrade()
CWalletDB walletdb("wallet.dat");
QList<QString> intOptions;
intOptions << "nDisplayUnit" << "nTransactionFee";
intOptions << "nDisplayUnit" << "nTransactionFee" << "nAnonymizeDarkcoinAmount" << "nDarksendRounds";
foreach(QString key, intOptions)
{
int value = 0;
@ -114,7 +114,7 @@ bool OptionsModel::Upgrade()
}
}
QList<QString> boolOptions;
boolOptions << "bDisplayAddresses" << "fMinimizeToTray" << "fMinimizeOnClose" << "fUseProxy" << "fUseUPnP" ;
boolOptions << "bDisplayAddresses" << "fMinimizeToTray" << "fMinimizeOnClose" << "fUseProxy" << "fUseUPnP" << "fDisableDarksend" ;
foreach(QString key, boolOptions)
{
bool value = false;
@ -299,17 +299,17 @@ bool OptionsModel::setData(const QModelIndex & index, const QVariant & value, in
break;
case DisableDarksend:
fDisableDarksend = value.toBool();
settings.setValue("fDisableDarksend", value);
settings.setValue("fDisableDarksend", fDisableDarksend);
emit disableDarksendChanged(fDisableDarksend);
break;
case DarksendRounds:
nDarksendRounds = value.toInt();
settings.setValue("nDarksendRounds", value);
settings.setValue("nDarksendRounds", nDarksendRounds);
emit darksendRoundsChanged(nDarksendRounds);
break;
case AnonymizeDarkcoinAmount:
nAnonymizeDarkcoinAmount = value.toInt();
settings.setValue("nAnonymizeDarkcoinAmount", value);
settings.setValue("nAnonymizeDarkcoinAmount", nAnonymizeDarkcoinAmount);
emit anonymizeDarkcoinAmountChanged(nAnonymizeDarkcoinAmount);
break;
case CoinControlFeatures: {