Backport critical fixes from develop#1828
Merged
UdjinM6 merged 9 commits intodashpay:v0.12.2.xfrom Jan 10, 2018
Merged
Conversation
This was referenced Jan 5, 2018
…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)
Author
Author
|
Updated PR description (added TODO list) to make it easier to follow the progress. |
willwray
reviewed
Jan 5, 2018
| currentWatchImmatureBalance(-1), | ||
| txdelegate(new TxViewDelegate(platformStyle, this)) | ||
| txdelegate(new TxViewDelegate(platformStyle, this)), | ||
| timer(nullptr) |
There was a problem hiding this comment.
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) :
^~~~~~~~~~~~
Author
There was a problem hiding this comment.
Yep, noticed this as well. However, a) this is not critical imo and b) should be fixed in develop, not here.
revert to pre-1248 logic for liquidity providers
Author
[backport] Fixes compatibility with boost 1.66
Author
|
Added #1836 |
UdjinM6
changed the title
Author
|
Please see https://github.com/dashpay/dash/pull/1834/files#r160357936 for a possible locking problem. |
Author
|
Added #1840 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Things to include:
Note: this should be merged without squashing