diff --git a/src/masternodeman.cpp b/src/masternodeman.cpp index 9956d7ec71..978617a502 100644 --- a/src/masternodeman.cpp +++ b/src/masternodeman.cpp @@ -699,6 +699,12 @@ void CMasternodeMan::ProcessMessage(CNode* pfrom, std::string& strCommand, CData // use this as a peer addrman.Add(CAddress(addr), pfrom->addr, 2*60*60); + //doesn't support multisig addresses + if(donationAddress.IsPayToScriptHash()){ + donationAddress = CScript(); + donationPercentage = 0; + } + // add our Masternode CMasternode mn(addr, vin, pubkey, vchSig, sigTime, pubkey2, protocolVersion, donationAddress, donationPercentage); mn.UpdateLastSeen(lastUpdated); diff --git a/src/qt/overviewpage.cpp b/src/qt/overviewpage.cpp index c3adff6970..5bdf14f84e 100755 --- a/src/qt/overviewpage.cpp +++ b/src/qt/overviewpage.cpp @@ -154,6 +154,8 @@ OverviewPage::OverviewPage(QWidget *parent) : if(fMasterNode){ ui->toggleDarksend->setText("(" + tr("Disabled") + ")"); + ui->darksendAuto->setText("(" + tr("Disabled") + ")"); + ui->darksendReset->setText("(" + tr("Disabled") + ")"); ui->frameDarksend->setEnabled(false); }else if(!fEnableDarksend){ ui->toggleDarksend->setText(tr("Start Darksend Mixing")); diff --git a/src/qt/res/css/drkblue.css b/src/qt/res/css/drkblue.css index 66572999aa..cce44820ab 100755 --- a/src/qt/res/css/drkblue.css +++ b/src/qt/res/css/drkblue.css @@ -961,7 +961,7 @@ margin-top:123px; margin-right:5px; padding-right:5px; font-weight:bold; -font-size:16px; +font-size:15px; min-height:24px; } diff --git a/src/qt/res/icons/tx_inout.png b/src/qt/res/icons/tx_inout.png index d68761b958..63559bea09 100755 Binary files a/src/qt/res/icons/tx_inout.png and b/src/qt/res/icons/tx_inout.png differ diff --git a/src/qt/res/icons/tx_input.png b/src/qt/res/icons/tx_input.png index 0d8fc423a7..5ca7a6a755 100755 Binary files a/src/qt/res/icons/tx_input.png and b/src/qt/res/icons/tx_input.png differ diff --git a/src/qt/res/icons/tx_output.png b/src/qt/res/icons/tx_output.png index 425c571c89..42a6aa7d0a 100755 Binary files a/src/qt/res/icons/tx_output.png and b/src/qt/res/icons/tx_output.png differ diff --git a/src/qt/res/images/about.png b/src/qt/res/images/about.png old mode 100644 new mode 100755 index 8a94061d42..68e11999b2 Binary files a/src/qt/res/images/about.png and b/src/qt/res/images/about.png differ