From 5429832675cde8febe30bd785f632b5592a151c3 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Sat, 23 Apr 2016 16:26:33 -0700
Subject: [PATCH] UI: Don't display x264 warning if using hardware

Don't display the warning for using two software encoders at the same
time if the stream encoder is not x264
---
 obs/window-basic-settings.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/obs/window-basic-settings.cpp b/obs/window-basic-settings.cpp
index 4204cbf20..aab1ad517 100644
--- a/obs/window-basic-settings.cpp
+++ b/obs/window-basic-settings.cpp
@@ -3271,9 +3271,10 @@ void OBSBasicSettings::SimpleRecordingEncoderChanged()
 		QString enc = ui->simpleOutRecEncoder->currentData().toString();
 		QString streamEnc =
 			ui->simpleOutStrEncoder->currentData().toString();
+		bool x264RecEnc = (enc == SIMPLE_ENCODER_X264 ||
+		                   enc == SIMPLE_ENCODER_X264_LOWCPU);
 
-		if (enc == SIMPLE_ENCODER_X264 ||
-		    enc == SIMPLE_ENCODER_X264_LOWCPU) {
+		if (streamEnc == SIMPLE_ENCODER_X264 && x264RecEnc) {
 			if (!warning.isEmpty())
 				warning += "\n\n";
 			warning += SIMPLE_OUTPUT_WARNING("Encoder");