From 5fb02c02dc93aeea3cbafd1df6d18a54fa2fb50c Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Tue, 19 Feb 2019 16:51:06 -0800
Subject: [PATCH] UI: Do not auto-remux if using FFmpeg output

---
 UI/window-basic-main.cpp | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
index 381a85b6c..681619915 100644
--- a/UI/window-basic-main.cpp
+++ b/UI/window-basic-main.cpp
@@ -5152,10 +5152,21 @@ void OBSBasic::StreamingStop(int code, QString last_error)
 void OBSBasic::AutoRemux()
 {
 	const char *mode = config_get_string(basicConfig, "Output", "Mode");
-	const char *path = strcmp(mode, "Advanced") != 0
+	bool advanced = astrcmpi(mode, "Advanced") == 0;
+
+	const char *path = !advanced
 		? config_get_string(basicConfig, "SimpleOutput", "FilePath")
 		: config_get_string(basicConfig, "AdvOut", "RecFilePath");
 
+	/* do not save if using FFmpeg output in advanced output mode */
+	if (advanced) {
+		const char *type = config_get_string(basicConfig, "AdvOut",
+				"RecType");
+		if (astrcmpi(type, "FFmpeg") == 0) {
+			return;
+		}
+	}
+
 	QString input;
 	input += path;
 	input += "/";
@@ -5163,6 +5174,11 @@ void OBSBasic::AutoRemux()
 
 	QFileInfo fi(remuxFilename.c_str());
 
+	/* do not remux if lossless */
+	if (fi.suffix().compare("avi", Qt::CaseInsensitive) == 0) {
+		return;
+	}
+
 	QString output;
 	output += path;
 	output += "/";