Git-Mirrors/haveno
1
0
Fork 0
mirror of https://github.com/haveno-dex/haveno.git synced 2025-08-19 03:38:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

Fix OS check

Browse source
This commit is contained in:
Manfred Karrer 2016-04-22 02:01:27 +02:00
parent 95b971150b
commit 5353e05c3f
2 changed files with 38 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

20
gui/src/main/java/io/bitsquare/app/BitsquareApp.java
View file

@ -208,14 +208,16 @@ public class BitsquareApp extends Application {
primaryStage.show();
if (!Utilities.isCorrectOSArchitecture())
new Popup<>().warning("You have the wrong version installed for the architecture of your computer.\n" +
"Your computers architecture is: " + System.getProperty("os.arch") + ".\n" +
"The Bitsquare binary you installed is: " + System.getProperty("sun.arch.data.model") + ".\n" +
"Please shut down and re-install the correct version (" + System.getProperty("os.arch") + ").")
.closeButtonText("Shut down")
.onClose(shutDownHandler::run)
if (!Utilities.isCorrectOSArchitecture()) {
String osArchitecture = Utilities.getOSArchitecture();
// We don't force a shutdown as the osArchitecture might in strange cases return a wrong value.
// Needs at least more testing on different machines...
new Popup<>().warning("You have probably the wrong version installed for the architecture of your computer.\n" +
"Your computers architecture is: " + osArchitecture + ".\n" +
"The Bitsquare binary you installed is: " + Utilities.getJVMArchitecture() + ".\n" +
"Please shut down and re-install the correct version (" + osArchitecture + ").")
.show();
}
} catch (Throwable throwable) {
showErrorPopup(throwable, false);
@ -225,8 +227,8 @@ public class BitsquareApp extends Application {
private void showSendAlertMessagePopup() {
AlertManager alertManager = injector.getInstance(AlertManager.class);
new SendAlertMessageWindow()
.onAddAlertMessage((alert, privKeyString) -> alertManager.addAlertMessageIfKeyIsValid(alert, privKeyString))
.onRemoveAlertMessage(privKeyString -> alertManager.removeAlertMessageIfKeyIsValid(privKeyString))
.onAddAlertMessage(alertManager::addAlertMessageIfKeyIsValid)
.onRemoveAlertMessage(alertManager::removeAlertMessageIfKeyIsValid)
.show();
}