Skip to content
Snippets Groups Projects
Commit ddfe8dd5 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

Fixed #173 - non running server leads to wrong server version alert

parent 292f12e3
Branches
Tags
1 merge request!213merge v1_6_0 into master
......@@ -291,7 +291,7 @@ public class Controller extends BaseController
Stage dialogStage = (Stage)alert.getDialogPane().getScene().getWindow();
dialogStage.getIcons().add(icon);
dialogStage.initOwner(parentStage);
dialogStage.initOwner(getStage());
alert.showAndWait();
alertIsShowing = false;
});
......@@ -385,7 +385,7 @@ public class Controller extends BaseController
Optional<ButtonType> result = alert.showAndWait();
if (result.get() == buttonTypeOne)
{
Stage modalStage = Helpers.showModal(Localization.getString(Strings.TITLE_MODAL), Localization.getString(Strings.LOAD_UPDATE), parentStage, icon);
Stage modalStage = Helpers.showModal(Localization.getString(Strings.TITLE_MODAL), Localization.getString(Strings.LOAD_UPDATE), getStage(), icon);
Worker.runLater(() -> {
try
......@@ -451,7 +451,7 @@ public class Controller extends BaseController
public void refresh(FilterSettings newFilterSettings)
{
Stage modalStage = Helpers.showModal(Localization.getString(Strings.TITLE_MODAL), Localization.getString(Strings.LOAD_DATA), parentStage, icon);
Stage modalStage = Helpers.showModal(Localization.getString(Strings.TITLE_MODAL), Localization.getString(Strings.LOAD_DATA), getStage(), icon);
Worker.runLater(() -> {
try
......@@ -484,6 +484,11 @@ public class Controller extends BaseController
}
catch(Exception e1)
{
Logger.error(e1);
if(e1.getMessage().contains("404"))
{
//old server
Platform.runLater(()->{
AlertGenerator.showAlert(AlertType.WARNING,
Localization.getString(Strings.TITLE_WARNING),
......@@ -499,6 +504,12 @@ public class Controller extends BaseController
toggleAllTabsExceptSettings(true);
tabPane.getSelectionModel().select(tabSettings);
});
}
else
{
//normal connection error (e.g. server not running)
showConnectionErrorAlert(ExceptionHandler.getMessageForException(e1));
}
return;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment