From: BuddyFriendGuy <bfggeneral@gmail.com>
Date: Sat, 16 May 2015 03:36:13 +0000 (-0400)
Subject: fix volume value preservation bug
X-Git-Tag: xonotic-v0.8.1~12^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ed40267b9d22a818396632f2035199dfb848c8aa;p=xonotic%2Fxonotic.git

fix volume value preservation bug
---

diff --git a/misc/tools/NexuizDemoRecorder/main/pom.xml b/misc/tools/NexuizDemoRecorder/main/pom.xml
index 03901941..821f0e09 100644
--- a/misc/tools/NexuizDemoRecorder/main/pom.xml
+++ b/misc/tools/NexuizDemoRecorder/main/pom.xml
@@ -4,7 +4,7 @@
 	<groupId>NexuizDemoRecorder</groupId>
 	<artifactId>NexuizDemoRecorder</artifactId>
 	<packaging>jar</packaging>
-	<version>0.3</version>
+	<version>0.3.1</version>
 	<name>NexuizDemoRecorder</name>
 	<url>http://maven.apache.org</url>
 	<dependencies>
diff --git a/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/application/democutter/DemoCutter.java b/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/application/democutter/DemoCutter.java
index a1174e66..21d19b96 100644
--- a/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/application/democutter/DemoCutter.java
+++ b/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/application/democutter/DemoCutter.java
@@ -99,37 +99,31 @@ public class DemoCutter {
 					if (firstLoop) {
 						injectBuffer = "\011\n" + injectAtStart + ";slowmo " + ffwSpeedFirstStage + "\n\000";
 						firstLoop = false;
-					}
-					if (demoStarted < 1 && svctime > (startTime - 50)) {
-						if (svcLoops == 0) {
-							//make sure that for short demos (duration less than 50 sec)
-							//the injectAtStart is still honored
-							injectBuffer = "\011\n" + injectAtStart + ";slowmo " + ffwSpeedSecondStage + "\n\000";
-						} else {
+					} else {
+						if (demoStarted < 1 && svctime > (startTime - 50)) {
 							injectBuffer = "\011\nslowmo " + ffwSpeedSecondStage + "\n\000";
+							demoStarted = 1;
+						}
+						if (demoStarted < 2 && svctime > (startTime - 5)) {
+							injectBuffer = "\011\nslowmo 1;" + injectBeforeCap +"\n\000";
+							demoStarted = 2;
+						}
+						if (demoStarted < 3 && svctime > startTime) {
+							injectBuffer = "\011\ncl_capturevideo 1\n\000";
+							demoStarted = 3;
+						}
+						if (!endIsReached && svctime > endTime) {
+							injectBuffer = "\011\ncl_capturevideo 0\n\000";
+							endIsReached = true;
+						}
+						if (endIsReached && !finalInjectionDone && svctime > (endTime + 1)) {
+							injectBuffer = "\011\n" + injectAfterCap + "\n\000";
+							finalInjectionDone = true;
+						}
+						if (finalInjectionDone && !disconnectIssued && svctime > (endTime + 2)) {
+							injectBuffer = "\011\ndisconnect\n\000";
+							disconnectIssued = true;
 						}
-						
-						demoStarted = 1;
-					}
-					if (demoStarted < 2 && svctime > (startTime - 5)) {
-						injectBuffer = "\011\nslowmo 1;" + injectBeforeCap +"\n\000";
-						demoStarted = 2;
-					}
-					if (demoStarted < 3 && svctime > startTime) {
-						injectBuffer = "\011\ncl_capturevideo 1\n\000";
-						demoStarted = 3;
-					}
-					if (!endIsReached && svctime > endTime) {
-						injectBuffer = "\011\ncl_capturevideo 0\n\000";
-						endIsReached = true;
-					}
-					if (endIsReached && !finalInjectionDone && svctime > (endTime + 1)) {
-						injectBuffer = "\011\n" + injectAfterCap + "\n\000";
-						finalInjectionDone = true;
-					}
-					if (finalInjectionDone && !disconnectIssued && svctime > (endTime + 2)) {
-						injectBuffer = "\011\ndisconnect\n\000";
-						disconnectIssued = true;
 					}
 					svcLoops++;
 				}
diff --git a/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/ui/swinggui/SwingGUI.java b/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/ui/swinggui/SwingGUI.java
index bb662c7c..a00de35b 100644
--- a/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/ui/swinggui/SwingGUI.java
+++ b/misc/tools/NexuizDemoRecorder/main/src/main/java/com/nexuiz/demorecorder/ui/swinggui/SwingGUI.java
@@ -144,7 +144,7 @@ public class SwingGUI extends JFrame implements WindowListener, DemoRecorderUI {
 	private static final String mainHelpSetName = "help/DemoRecorderHelp.hs";
 
 	public SwingGUI(DemoRecorderApplication appLayer) {
-		super("Nexuiz Demo Recorder v0.3");
+		super("Nexuiz Demo Recorder v0.3.1");
 		addWindowListener(this);
 
 		this.appLayer = appLayer;