Skip to content

Backport critical fixes from develop#1828

Merged
UdjinM6 merged 9 commits into
dashpay:v0.12.2.xfrom
UdjinM6:bp_1810_1819
Jan 10, 2018
Merged

Backport critical fixes from develop#1828
UdjinM6 merged 9 commits into
dashpay:v0.12.2.xfrom
UdjinM6:bp_1810_1819

Conversation

codablock and others added 3 commits January 5, 2018 16:38
…et (dashpay#1819)

dashpay#1695 introduced a fix for a instant send related edge case. Somehow the
parameters got mixed up and fUseInstantSend was passed as "iterations".
d7828ab check that transactionView->selectionModel()->selectedRows(0) exists (fsb4000)
@UdjinM6

UdjinM6 commented Jan 5, 2018

Copy link
Copy Markdown
Author

Rebased and added 3f7273d (BUG: bitcoin-qt crash) from #1821 (instead of #1800 which was dropped to streamline v0.12.2.x)

@schinzelh schinzelh left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@UdjinM6

UdjinM6 commented Jan 5, 2018

Copy link
Copy Markdown
Author

Updated PR description (added TODO list) to make it easier to follow the progress.

Comment thread src/qt/overviewpage.cpp
currentWatchImmatureBalance(-1),
txdelegate(new TxViewDelegate(platformStyle, this))
txdelegate(new TxViewDelegate(platformStyle, this)),
timer(nullptr)

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

timer should be initialised first in the list.
gcc 7.1 gives this warning:

In file included from ../../src/qt/overviewpage.cpp:6:0:
../../src/qt/overviewpage.h: In constructor ‘OverviewPage::OverviewPage(const PlatformStyle*, QWidget*)’:
../../src/qt/overviewpage.h:64:21: warning: ‘OverviewPage::txdelegate’ will be initialized after [-Wreorder]
     TxViewDelegate *txdelegate;
                     ^~~~~~~~~~
../../src/qt/overviewpage.h:50:13: warning:   ‘QTimer* OverviewPage::timer’ [-Wreorder]
     QTimer *timer;
             ^~~~~
../../src/qt/overviewpage.cpp:124:1: warning:   when initialized here [-Wreorder]
 OverviewPage::OverviewPage(const PlatformStyle *platformStyle, QWidget *parent) :
 ^~~~~~~~~~~~

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep, noticed this as well. However, a) this is not critical imo and b) should be fixed in develop, not here.

@UdjinM6

UdjinM6 commented Jan 6, 2018

Copy link
Copy Markdown
Author

Added #1826 and #1829

[backport] Fixes compatibility with boost 1.66
@UdjinM6

UdjinM6 commented Jan 7, 2018

Copy link
Copy Markdown
Author

Added #1836

@UdjinM6 UdjinM6 changed the title Backport bugfixes from develop Backport critical fixes from develop Jan 8, 2018
@dashpay dashpay deleted a comment from bodapanxu Jan 8, 2018
@UdjinM6

UdjinM6 commented Jan 9, 2018

Copy link
Copy Markdown
Author

Added #1833 and #1834

This should be ready for the final review now.

@codablock

Copy link
Copy Markdown

Please see https://github.com/dashpay/dash/pull/1834/files#r160357936 for a possible locking problem.

@UdjinM6

UdjinM6 commented Jan 9, 2018

Copy link
Copy Markdown
Author

Added #1840

@codablock codablock left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

utACK

@UdjinM6
UdjinM6 merged commit 57e7cc4 into dashpay:v0.12.2.x Jan 10, 2018
@UdjinM6
UdjinM6 deleted the bp_1810_1819 branch November 26, 2020 11:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants