fixes for windows

cgarwood · Jun 2, 2018 · 19c888e · 19c888e
1 parent b0f336c
commit 19c888e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/index.html b/index.html
@@ -30,16 +30,16 @@
 			console.log(message);
 		}
 		if (message['acn'] == "fv") {
-			if (message['ary'][0]['txt'] != undefined) {
+			if (message['ary'][0]['txt'] != undefined && message['ary'][0]['acn'] == 'cs') {
 				console.log(message['ary']);
 				var text = '';
 				var lyric = '';
 				if (typeof message['ary'][2] !== 'undefined' && message['ary'][2]['txt'] != 'novmix') {
 					lyric = message['ary'][0]['txt'];
-					text = lyric.replaceAll("\n", "%0A").replaceAll("\r", "%0A");
+					text = lyric.replaceAll("\r\n", "%0A").replaceAll("\n", "%0A").replaceAll("\r", "%0A");
 				}
 
-				$("#cs").html(lyric.replaceAll("\n","<br>").replaceAll("\r","<br>"));
+				$("#cs").html(lyric.replaceAll("\r\n", "%0A").replaceAll("\n","<br>").replaceAll("\r","<br>"));
 
 				//Send slide data to vMix
 				$.get("http://"+config['vmix_ip']+":"+config['vmix_port']+"/api/?Function=SetText&SelectedIndex=0&Input="+config['vmix_input']+"&Value="+text);