moved globalScreenListener setup to one place

Author: Death111

src/main/java/de/doubleslash/keeptime/App.java

@@ -24,14 +24,14 @@
 import java.util.Optional;
 import java.util.stream.Collectors;
 
-import de.doubleslash.keeptime.common.OS;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.ConfigurableApplicationContext;
 
 import de.doubleslash.keeptime.common.FontProvider;
+import de.doubleslash.keeptime.common.OS;
 import de.doubleslash.keeptime.common.Resources;
 import de.doubleslash.keeptime.common.Resources.RESOURCE;
 import de.doubleslash.keeptime.controller.Controller;
@@ -220,14 +220,6 @@ private void readSettings() {
    private void initialisePopupUI(final Stage primaryStage) throws IOException {
       LOG.debug("Initialising popup UI.");
 
-
-      if(!OS.isLinux()) {
-         globalScreenListener = new GlobalScreenListener();
-      }
-      if(globalScreenListener!=null){
-         model.useHotkey.addListener((a, b, newValue) -> globalScreenListener.register(newValue));
-         globalScreenListener.register(model.useHotkey.get());
-      }
       popupViewStage = new Stage();
       popupViewStage.initOwner(primaryStage);
       // Load root layout from fxml file.
@@ -245,8 +237,12 @@ private void initialisePopupUI(final Stage primaryStage) throws IOException {
       popupViewStage.setAlwaysOnTop(true);
       final ViewControllerPopup viewControllerPopupController = loader.getController();
       viewControllerPopupController.setStage(popupViewStage);
-      if (globalScreenListener != null) {
+
+      if (!OS.isLinux()) {
+         globalScreenListener = new GlobalScreenListener();
+         globalScreenListener.register(model.useHotkey.get());
          globalScreenListener.setViewController(viewControllerPopupController);
+         model.useHotkey.addListener((a, b, newValue) -> globalScreenListener.register(newValue));
       }
    }