New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not ask a UI question from bitcoind #8257

Merged
merged 1 commit into from Jun 28, 2016

Conversation

Projects
None yet
5 participants
@sipa
Member

sipa commented Jun 24, 2016

Fixes #8255 (we shouldn't ask to reindex when running without UI).

@instagibbs

This comment has been minimized.

Show comment
Hide comment
@instagibbs

instagibbs Jun 24, 2016

Member

concept ACK. I was very confused when I thought it was a real question.

Member

instagibbs commented Jun 24, 2016

concept ACK. I was very confused when I thought it was a real question.

@laanwj

View changes

Show outdated Hide outdated src/ui_interface.h
@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Jun 24, 2016

Member

Concept ACK
utACK 1acf1db

Member

laanwj commented Jun 24, 2016

Concept ACK
utACK 1acf1db

@laanwj laanwj added the GUI label Jun 24, 2016

@laanwj laanwj added this to the 0.13.0 milestone Jun 25, 2016

@jtimon

This comment has been minimized.

Show comment
Hide comment
@jtimon

jtimon Jun 25, 2016

Member

utACK 1acf1db

Member

jtimon commented Jun 25, 2016

utACK 1acf1db

@jonasschnelli

This comment has been minimized.

Show comment
Hide comment
@jonasschnelli
Member

jonasschnelli commented Jun 25, 2016

utACK 1acf1db

@laanwj

This comment has been minimized.

Show comment
Hide comment
@laanwj

laanwj Jun 28, 2016

Member

Tested ACK 1acf1db.

$ src/bitcoind -datadir=/store/tmp/testbtc 
: Load Error..
Please restart with -reindex or -reindex-chainstate to recover.
bitcoind: /home/orion/projects/bitcoin/bitcoin/src/scheduler.cpp:19: CScheduler::~CScheduler(): Assertion `nThreadsServicingQueue == 0' failed.
Aborted (core dumped)

The CScheduler assertion issue is unrelated (this is issue #6735).

GUI correctly asks the question, also verified that Abort and OK give back the correct result.

Member

laanwj commented Jun 28, 2016

Tested ACK 1acf1db.

$ src/bitcoind -datadir=/store/tmp/testbtc 
: Load Error..
Please restart with -reindex or -reindex-chainstate to recover.
bitcoind: /home/orion/projects/bitcoin/bitcoin/src/scheduler.cpp:19: CScheduler::~CScheduler(): Assertion `nThreadsServicingQueue == 0' failed.
Aborted (core dumped)

The CScheduler assertion issue is unrelated (this is issue #6735).

GUI correctly asks the question, also verified that Abort and OK give back the correct result.

@laanwj laanwj merged commit 1acf1db into bitcoin:master Jun 28, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Jun 28, 2016

Merge #8257: Do not ask a UI question from bitcoind
1acf1db Do not ask a UI question from bitcoind (Pieter Wuille)

zkbot added a commit to zcash/zcash that referenced this pull request Mar 1, 2017

Auto merge of #2130 - str4d:2095-metrics-reindex-msg, r=arcalinea
Do not ask a UI question on metrics screen

Based on bitcoin/bitcoin#8257.

Closes #2095.

zkbot added a commit to zcash/zcash that referenced this pull request Mar 2, 2017

Auto merge of #2130 - str4d:2095-metrics-reindex-msg, r=arcalinea
Do not ask a UI question on metrics screen

Based on bitcoin/bitcoin#8257.

Closes #2095.

codablock added a commit to codablock/dash that referenced this pull request Sep 7, 2017

Merge bitcoin#8257: Do not ask a UI question from bitcoind
1acf1db Do not ask a UI question from bitcoind (Pieter Wuille)

UdjinM6 added a commit to dashpay/dash that referenced this pull request Sep 9, 2017

Backport Bitcoin Qt/Gui changes up to 0.14.x part 2 (#1615)
* Merge bitcoin#7506: Use CCoinControl selection in CWallet::FundTransaction

d6cc6a1 Use CCoinControl selection in CWallet::FundTransaction (João Barbosa)

* Merge bitcoin#7732: [Qt] Debug window: replace "Build date" with "Datadir"

fc737d1 [Qt] remove unused formatBuildDate method (Jonas Schnelli)
4856f1d [Qt] Debug window: replace "Build date" with "Datadir" (Jonas Schnelli)

* Merge bitcoin#7707: [RPC][QT] UI support for abandoned transactions

8efed3b [Qt] Support for abandoned/abandoning transactions (Jonas Schnelli)

* Merge bitcoin#7688: List solvability in listunspent output and improve help

c3932b3 List solvability in listunspent output and improve help (Pieter Wuille)

* Merge bitcoin#8006: Qt: Add option to disable the system tray icon

8b0e497 Qt: Add option to hide the system tray icon (Tyler Hardin)

* Merge bitcoin#8073: qt: askpassphrasedialog: Clear pass fields on accept

02ce2a3 qt: askpassphrasedialog: Clear pass fields on accept (Pavel Vasin)

* Merge bitcoin#8231: [Qt] fix a bug where the SplashScreen will not be hidden during startup

b3e1348 [Qt] fix a bug where the SplashScreen will not be hidden during startup (Jonas Schnelli)

* Merge bitcoin#8257: Do not ask a UI question from bitcoind

1acf1db Do not ask a UI question from bitcoind (Pieter Wuille)

* Merge bitcoin#8463: [qt] Remove Priority from coincontrol dialog

fa8dd78 [qt] Remove Priority from coincontrol dialog (MarcoFalke)

* Merge bitcoin#8678: [Qt][CoinControl] fix UI bug that could result in paying unexpected fee

0480293 [Qt][CoinControl] fix UI bug that could result in paying unexpected fee (Jonas Schnelli)

* Merge bitcoin#8672: Qt: Show transaction size in transaction details window

c015634 qt: Adding transaction size to transaction details window (Hampus Sjöberg)
 \-- merge fix for s/size/total size/
fdf82fb Adding method GetTotalSize() to CTransaction (Hampus Sjöberg)

* Merge bitcoin#8371: [Qt] Add out-of-sync modal info layer

08827df [Qt] modalinfolayer: removed unused comments, renamed signal, code style overhaul (Jonas Schnelli)
d8b062e [Qt] only update "amount of blocks left" when the header chain is in-sync (Jonas Schnelli)
e3245b4 [Qt] add out-of-sync modal info layer (Jonas Schnelli)
e47052f [Qt] ClientModel add method to get the height of the header chain (Jonas Schnelli)
a001f18 [Qt] Always pass the numBlocksChanged signal for headers tip changed (Jonas Schnelli)
bd44a04 [Qt] make Out-Of-Sync warning icon clickable (Jonas Schnelli)
0904c3c [Refactor] refactor function that forms human readable text out of a timeoffset (Jonas Schnelli)

* Merge bitcoin#8805: Trivial: Grammar and capitalization

c9ce17b Trivial: Grammar and capitalization (Derek Miller)

* Merge bitcoin#8885: gui: fix ban from qt console

cb78c60 gui: fix ban from qt console (Cory Fields)

* Merge bitcoin#8821: [qt] sync-overlay: Don't block during reindex

fa85e86 [qt] sync-overlay: Don't show estimated number of headers left (MarcoFalke)
faa4de2 [qt] sync-overlay: Don't block during reindex (MarcoFalke)

* Support themes for new transaction_abandoned icon

* Fix constructor call to COutput

* Merge bitcoin#7842: RPC: do not print minping time in getpeerinfo when no ping received yet

62a6486 RPC: do not print ping info in getpeerinfo when no ping received yet, fix help (Pavel Janík)

* Merge bitcoin#8918: Qt: Add "Copy URI" to payment request context menu

21f5a63 Qt: Add "Copy URI" to payment request context menu (Luke Dashjr)

* Merge bitcoin#8925: qt: Display minimum ping in debug window.

1724a40 Display minimum ping in debug window. (R E Broadley)

* Merge bitcoin#8972: [Qt] make warnings label selectable (jonasschnelli)

ef0c9ee [Qt] make warnings label selectable (Jonas Schnelli)

* Make background of warning icon transparent in modaloverlay

* Merge bitcoin#9088: Reduce ambiguity of warning message

77cbbd9 Make warning message about wallet balance possibly being incorrect less ambiguous. (R E Broadley)

* Replace Bitcoin with Dash in modal overlay

* Remove clicked signals from labelWalletStatus and labelTransactionsStatus

As both are really just labels, clicking on those is not possible.
This is different in Bitcoin, where these labels are actually buttons.

* Pull out modaloverlay show/hide into it's own if/else block and switch to time based check

Also don't use masternodeSync.IsBlockchainSynced() for now as it won't
report the blockchain being synced before the first block (or other MN
data?) arrives. This would otherwise give the impression that sync is
being stuck.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment