Fixed error display on differen OS

t3rmian · Nov 28, 2017 · 368ff25 · 368ff25
1 parent a7ee3de
commit 368ff25
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
 
     <groupId>io.github.t3r1jj</groupId>
     <artifactId>GammaJ</artifactId>
-    <version>1.1.0-SNAPSHOT</version>
+    <version>1.1.0</version>
     <packaging>jar</packaging>
 
     <properties>

diff --git a/src/main/java/io/github/t3r1jj/gammaj/GammaJ.java b/src/main/java/io/github/t3r1jj/gammaj/GammaJ.java
@@ -41,7 +41,7 @@
 public class GammaJ extends Application {
 
     private static final String appIconPath = "images/tray_icon.png";
-    private final ViewModel viewModel = ViewModel.getInstance();
+    private ViewModel viewModel;
     private TrayManager trayManager;
 
     @Override
@@ -53,8 +53,9 @@ public void start(Stage stage) throws Exception {
         fXMLLoader.setControllerFactory(new ApplicationControllerFactory(getHostServices(), trayManager, viewModel));
         Parent root = null;
         try {
+            viewModel = ViewModel.getInstance();
             root = fXMLLoader.load();
-        } catch (GammaWinapiCallException exception) {
+        } catch (UnsatisfiedLinkError | GammaWinapiCallException exception) {
             JOptionPane.showConfirmDialog(null, resources.getString("initialization_error_message"),
                     resources.getString("initialization_error"), JOptionPane.DEFAULT_OPTION, JOptionPane.ERROR_MESSAGE);
             Platform.exit();

diff --git a/src/main/resources/bundles/LangBundle_en.properties b/src/main/resources/bundles/LangBundle_en.properties
@@ -0,0 +1 @@
+brightness=brightness