Skip to content
This repository has been archived by the owner on May 13, 2022. It is now read-only.

Fix NotifyThread #535

Merged
merged 1 commit into from
May 26, 2016
Merged

Fix NotifyThread #535

merged 1 commit into from
May 26, 2016

Conversation

wozz
Copy link
Contributor

@wozz wozz commented May 24, 2016

Extra line, looks like a merge error

Extra line, looks like a merge error
@AdamISZ
Copy link
Member

AdamISZ commented May 24, 2016

I suspect this is connected to whatever caused the merge of joinmarket-qt code into master (you might remember @chris-belcher we discussed it on IRC).

I think problems already started before the last release because master had diverged from develop. I suspect the right solution is to force-push from develop and make a new release.

@AdamISZ
Copy link
Member

AdamISZ commented May 24, 2016

Seems the stale version of the call would have the thread die in the background due to the wrong syntax (blockr_domain) so probably not causing users problems right now.

@wozz
Copy link
Contributor Author

wozz commented May 24, 2016

What happens when it's like this is it completely crashes on the first call because the number of arguments is wrong. It doesn't make it to the second call.

Removing the first line then causes the thread to die like you described. So the fix is to add the last argument to the first call.

@AdamISZ
Copy link
Member

AdamISZ commented May 24, 2016

Oh I see, my mistake; I thought this was the release, it's only the most recent commit which is after that.

@chris-belcher
Copy link
Collaborator

Very weird that this happened. I think it might be because I didnt always git pull before I git merge'd.

@chris-belcher chris-belcher merged commit 66bd67a into JoinMarket-Org:master May 26, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants