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.

Sign up for GitHub

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

Change startup order to prevent Bouncy Castle exception #1519

Merged
merged 1 commit into from
Apr 24, 2018
Merged

Change startup order to prevent Bouncy Castle exception #1519

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/main/java/bisq/desktop/app/BisqAppMain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,8 @@ protected void configUserThread() {
protected void launchApplication() {
BisqApp.setAppLaunchedHandler(application -> {
BisqAppMain.this.application = (BisqApp) application;
// Necessary to do the setup at this point to prevent Bouncy Castle errors
CommonSetup.setup(BisqAppMain.this.application);
// Map to user thread!
UserThread.execute(this::onApplicationLaunched);
});
Expand All @@ -79,9 +81,7 @@ protected void launchApplication() {
@Override
protected void onApplicationLaunched() {
super.onApplicationLaunched();

application.setGracefulShutDownHandler(this);
CommonSetup.setup(application);
}

///////////////////////////////////////////////////////////////////////////////////////////
Expand Down