Skip to content
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

[Backport 0.12][RPC] quickfix for RPC timer interface problem #7318

Merged
merged 1 commit into from
Jan 8, 2016

Conversation

jonasschnelli
Copy link
Contributor

Taking the last interface will always result in preferring the non QT timer interface which results in walletpassphase re-locking correctly over RPC and over the GUI console.
Should fix #7316 for 0.12.

Clean fix for master is in #7317.

@laanwj
Copy link
Member

laanwj commented Jan 8, 2016

utACK

@jonasschnelli jonasschnelli changed the title Backport: quickfix for RPC timer interface problem [Backport 0.12][RPC] quickfix for RPC timer interface problem Jan 8, 2016
@btcdrak
Copy link
Contributor

btcdrak commented Jan 8, 2016

utACK daa8da2

@maflcko
Copy link
Member

maflcko commented Jan 8, 2016

Tested ACK 9490ec3 (which should be similar to daa8da2), indeed fixes #7316 (comment).

@laanwj
Copy link
Member

laanwj commented Jan 8, 2016

utACK

@laanwj laanwj merged commit daa8da2 into bitcoin:0.12 Jan 8, 2016
laanwj added a commit that referenced this pull request Jan 8, 2016
daa8da2 Backport: quickfix for RPC timer interface problem (Jonas Schnelli)
@luke-jr
Copy link
Member

luke-jr commented Feb 11, 2016

In the future, please put these kind of details in the commit message itself. :/

@maflcko
Copy link
Member

maflcko commented Feb 13, 2016

Right, if you are doing the rebase anyway, additional info like in a74fa1f is helpful. If a rebase is not necessary, a new pull should be created anyway, so the commit ends up in the release note logs.

@bitcoin bitcoin locked as resolved and limited conversation to collaborators Sep 8, 2021
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants