Change warning message for empty api response

restreamio · Jan 23, 2025 · 89ae060 · 89ae060
1 parent 5d6f4cb
commit 89ae060
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/frontend/data/locale/en-US.ini b/frontend/data/locale/en-US.ini
@@ -1572,6 +1572,7 @@ Restream.Actions.BroadcastLoadingTitle="Loading broadcast information..."
 Restream.Actions.BroadcastLoadingText="Loading broadcast information for %1, please wait..."
 Restream.Actions.BroadcastLoadingFailureTitle="Failed to load broadcast information"
 Restream.Actions.BroadcastLoadingFailureText="Failed to load broadcast information for %1\n\n%2: %3"
+Restream.Actions.BroadcastLoadingEmptyText="Failed to access Restream setup.\nPlease select a broadcast to enable streaming."
 
 # MultitrackVideo
 ConfigDownload.WarningMessageTitle="Warning"

diff --git a/frontend/oauth/RestreamAuth.cpp b/frontend/oauth/RestreamAuth.cpp
@@ -88,8 +88,11 @@ try {
 		throw ErrorInfo(error, json["error_description"].string_value());
 
 	auto items = json.array_items();
-	if (!items.size())
-		throw ErrorInfo("Failed to get upcoming events info from remote", "Event list is empty");
+	if (!items.size()) {
+		OBSMessageBox::warning(OBSBasic::Get(), QTStr("Restream.Actions.BroadcastLoadingFailureTitle"),
+				       QTStr("Restream.Actions.BroadcastLoadingEmptyText"));
+		return QVector<RestreamEventDescription>();
+	}
 
 	for (auto item : items) {
 		RestreamEventDescription event;
@@ -110,11 +113,8 @@ try {
 	QString title = QTStr("Restream.Actions.BroadcastLoadingFailureTitle");
 	QString text = QTStr("Restream.Actions.BroadcastLoadingFailureText")
 			       .arg(service(), info.message.c_str(), info.error.c_str());
-
 	QMessageBox::warning(OBSBasic::Get(), title, text);
-
 	blog(LOG_WARNING, "%s: %s: %s", __FUNCTION__, info.message.c_str(), info.error.c_str());
-
 	return QVector<RestreamEventDescription>();
 }
 
@@ -169,9 +169,7 @@ try {
 	QString title = QTStr("Restream.Actions.BroadcastLoadingFailureTitle");
 	QString text = QTStr("Restream.Actions.BroadcastLoadingFailureText")
 			       .arg(service(), info.message.c_str(), info.error.c_str());
-
 	QMessageBox::warning(OBSBasic::Get(), title, text);
-
 	blog(LOG_WARNING, "%s: %s: %s", __FUNCTION__, info.message.c_str(), info.error.c_str());
 	return "";
 }