From 2933b8973378f8851924c61225765d4c9edde5bc Mon Sep 17 00:00:00 2001
From: Richard Stanway <r1ch@r1ch.net>
Date: Mon, 15 May 2017 12:03:00 +0200
Subject: [PATCH] UI: Add support for showing output error messages

---
 UI/window-basic-main-outputs.cpp |  5 ++++-
 UI/window-basic-main.cpp         | 28 ++++++++++++++++++++--------
 UI/window-basic-main.hpp         |  2 +-
 3 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/UI/window-basic-main-outputs.cpp b/UI/window-basic-main-outputs.cpp
index 033afd69e..1dcd87389 100644
--- a/UI/window-basic-main-outputs.cpp
+++ b/UI/window-basic-main-outputs.cpp
@@ -48,11 +48,14 @@ static void OBSStopStreaming(void *data, calldata_t *params)
 {
 	BasicOutputHandler *output = static_cast<BasicOutputHandler*>(data);
 	int code = (int)calldata_int(params, "code");
+	const char *last_error = calldata_string(params, "last_error");
+
+	QString arg_last_error = QString::fromUtf8(last_error);
 
 	output->streamingActive = false;
 	output->delayActive = false;
 	QMetaObject::invokeMethod(output->main,
-			"StreamingStop", Q_ARG(int, code));
+			"StreamingStop", Q_ARG(int, code), Q_ARG(QString, arg_last_error));
 }
 
 static void OBSStartRecording(void *data, calldata_t *params)
diff --git a/UI/window-basic-main.cpp b/UI/window-basic-main.cpp
index 4d12e8196..c21da7459 100644
--- a/UI/window-basic-main.cpp
+++ b/UI/window-basic-main.cpp
@@ -32,6 +32,7 @@
 #include <util/util.hpp>
 #include <util/platform.h>
 #include <util/profiler.hpp>
+#include <util/dstr.hpp>
 #include <graphics/math-defs.h>
 
 #include "obs-app.hpp"
@@ -4164,34 +4165,45 @@ void OBSBasic::StreamStopping()
 		api->on_event(OBS_FRONTEND_EVENT_STREAMING_STOPPING);
 }
 
-void OBSBasic::StreamingStop(int code)
+void OBSBasic::StreamingStop(int code, QString last_error)
 {
-	const char *errorMessage;
+	const char *errorDescription;
+	DStr errorMessage;
+	bool use_last_error = false;
 
 	switch (code) {
 	case OBS_OUTPUT_BAD_PATH:
-		errorMessage = Str("Output.ConnectFail.BadPath");
+		errorDescription = Str("Output.ConnectFail.BadPath");
 		break;
 
 	case OBS_OUTPUT_CONNECT_FAILED:
-		errorMessage = Str("Output.ConnectFail.ConnectFailed");
+		use_last_error = true;
+		errorDescription = Str("Output.ConnectFail.ConnectFailed");
 		break;
 
 	case OBS_OUTPUT_INVALID_STREAM:
-		errorMessage = Str("Output.ConnectFail.InvalidStream");
+		errorDescription = Str("Output.ConnectFail.InvalidStream");
 		break;
 
 	default:
 	case OBS_OUTPUT_ERROR:
-		errorMessage = Str("Output.ConnectFail.Error");
+		use_last_error = true;
+		errorDescription = Str("Output.ConnectFail.Error");
 		break;
 
 	case OBS_OUTPUT_DISCONNECTED:
 		/* doesn't happen if output is set to reconnect.  note that
 		 * reconnects are handled in the output, not in the UI */
-		errorMessage = Str("Output.ConnectFail.Disconnected");
+		use_last_error = true;
+		errorDescription = Str("Output.ConnectFail.Disconnected");
 	}
 
+	if (use_last_error && !last_error.isEmpty())
+		dstr_printf(errorMessage, "%s\n\n%s", errorDescription,
+			QT_TO_UTF8(last_error));
+	else
+		dstr_copy(errorMessage, errorDescription);
+
 	ui->statusbar->StreamStopped();
 
 	ui->streamButton->setText(QTStr("Basic.Main.StartStreaming"));
@@ -4215,7 +4227,7 @@ void OBSBasic::StreamingStop(int code)
 				QTStr("Output.ConnectFail.Title"),
 				QT_UTF8(errorMessage));
 	} else if (code != OBS_OUTPUT_SUCCESS && !isVisible()) {
-		SysTrayNotify(QT_UTF8(errorMessage), QSystemTrayIcon::Warning);
+		SysTrayNotify(QT_UTF8(errorDescription), QSystemTrayIcon::Warning);
 	}
 
 	if (!startStreamMenu.isNull()) {
diff --git a/UI/window-basic-main.hpp b/UI/window-basic-main.hpp
index 582f47c2b..55cad9514 100644
--- a/UI/window-basic-main.hpp
+++ b/UI/window-basic-main.hpp
@@ -363,7 +363,7 @@ public slots:
 
 	void StreamingStart();
 	void StreamStopping();
-	void StreamingStop(int errorcode);
+	void StreamingStop(int errorcode, QString last_error);
 
 	void StartRecording();
 	void StopRecording();