Skip to content

Commit e512eac

Browse files
committed
Merge bitcoin#2513: [GUI] Remove extra jump line in mnb creation error message
edaadc7 Remove extra jump line in CMasternodeBroadcast::Create return error message. (furszy) Pull request description: Tiny bugfix that appeared walking through the wallet.. None of the mnb creation error strings contain a jump line because the returned string is used as command line output and in the GUI snackbar. None of them are expecting it, in the GUI, the snackbar notification text is being cut. ACKs for top commit: random-zebra: utACK edaadc7 Fuzzbawls: utACK edaadc7 Tree-SHA512: f3ebe30e3a7b62b8968ba686ac04e4873c10e268711a48af6528c20225010bfcbceb499c4e2f83cdc6009abee285d992cffa22ea8b7c59db9e52a0843486afed
2 parents ac4c11f + edaadc7 commit e512eac

File tree

2 files changed

+1
-4
lines changed

2 files changed

+1
-4
lines changed

src/masternode.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ bool CMasternodeBroadcast::Create(const std::string& strService,
304304
// Check if the MN has a ADDRv2 and reject it if the new NU wasn't enforced.
305305
if (!_service.IsAddrV1Compatible() &&
306306
!Params().GetConsensus().NetworkUpgradeActive(chainHeight, Consensus::UPGRADE_V5_3)) {
307-
strErrorRet = "Cannot start MN with a v2 address before the v5.3 enforcement\n";
307+
strErrorRet = "Cannot start MN with a v2 address before the v5.3 enforcement";
308308
return false;
309309
}
310310

src/qt/pivx/masternodeswidget.cpp

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
#include "masternode-sync.h"
1919
#include "masternodeconfig.h"
2020
#include "masternodeman.h"
21-
#include "wallet/wallet.h"
2221
#include "util/system.h"
2322
#include "qt/pivx/optionbutton.h"
2423
#include <fstream>
@@ -31,8 +30,6 @@
3130
class MNHolder : public FurListRow<QWidget*>
3231
{
3332
public:
34-
MNHolder();
35-
3633
explicit MNHolder(bool _isLightTheme) : FurListRow(), isLightTheme(_isLightTheme) {}
3734

3835
MNRow* createHolder(int pos) override

0 commit comments

Comments
 (0)