Merge branch 'dev'

CHANGELOG.md

@@ -1,14 +1,14 @@
 1.14.0
 ========================
 * Added setting for MFC to ignore the upscaled (960p) stream
-* Added event system. You can define to show a notification,
-  play a sound or execute a program, when the state of a model
-  or recording changes
+* Added event system. You can define to show a notification, play a sound or
+  execute a program, when the state of a model or recording changes
 * Added "follow" menu entry on the Recording tab
-* Fix: Recordings change from suspended to recording by their own
-  when a thumbnail tab is opened and the model is showing
-* Fix: Linux scripts don't work on system where bash isn't the
-  default shell
+* Fix: Recordings change from suspended to recording by their own when a
+  thumbnail tab is opened and the model is showing
+* Fix: Linux scripts don't work on system where bash isn't the default shell
+* Improved loading and display of resolution tags. They are not re-loaded
+  everytime to switch between tabs
 
 1.13.0
 ========================

client/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>ctbrec</groupId>
 		<artifactId>master</artifactId>
-		<version>1.13.0</version>
+		<version>1.14.0</version>
 		<relativePath>../master</relativePath>
 	</parent>
 

client/src/main/java/ctbrec/ui/CamrecApplication.java

@@ -12,6 +12,7 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -206,20 +207,21 @@ public class CamrecApplication extends Application {
     }
 
     private void registerAlertSystem() {
-        //            try {
-        //                // don't register before 1 minute has passed, because directly after
-        //                // the start of ctbrec, an event for every online model would be fired,
-        //                // which is annoying as f
-        //                Thread.sleep(TimeUnit.MINUTES.toMillis(1));
-        //            } catch (InterruptedException e) {
-        //                e.printStackTrace();
-        //            }
-        for (EventHandlerConfiguration config : Config.getInstance().getSettings().eventHandlers) {
-            EventHandler handler = new EventHandler(config);
-            EventBusHolder.register(handler);
-            LOG.debug("Registered event handler for {} {}", config.getEvent(), config.getName());
+        try {
+            // don't register before 1 minute has passed, because directly after
+            // the start of ctbrec, an event for every online model would be fired,
+            // which is annoying as f
+            Thread.sleep(TimeUnit.MINUTES.toMillis(1));
+
+            for (EventHandlerConfiguration config : Config.getInstance().getSettings().eventHandlers) {
+                EventHandler handler = new EventHandler(config);
+                EventBusHolder.register(handler);
+                LOG.debug("Registered event handler for {} {}", config.getEvent(), config.getName());
+            }
+            LOG.debug("Alert System registered");
+        } catch (InterruptedException e) {
+            e.printStackTrace();
         }
-        LOG.debug("Alert System registered");
     }
 
     private void writeColorSchemeStyleSheet(Stage primaryStage) {

common/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>ctbrec</groupId>
 		<artifactId>master</artifactId>
-		<version>1.13.0</version>
+		<version>1.14.0</version>
 		<relativePath>../master</relativePath>
 	</parent>
 

master/pom.xml

@@ -6,7 +6,7 @@
 	<groupId>ctbrec</groupId>
 	<artifactId>master</artifactId>
     <packaging>pom</packaging>
-	<version>1.13.0</version>
+	<version>1.14.0</version>
 	
 	<modules>
 		<module>../common</module>

server/pom.xml

@@ -8,7 +8,7 @@
 	<parent>
 		<groupId>ctbrec</groupId>
 		<artifactId>master</artifactId>
-		<version>1.13.0</version>
+		<version>1.14.0</version>
 		<relativePath>../master</relativePath>
 	</parent>