Fix hyperion-project#1551

Lord-Grey · Dec 31, 2022 · 3157f3d · 3157f3d
1 parent 36e9630
commit 3157f3d
Show file tree

Hide file tree

Showing 3 changed files with 73 additions and 20 deletions.
diff --git a/include/mdns/MdnsBrowser.h b/include/mdns/MdnsBrowser.h
@@ -19,6 +19,7 @@
 
 // Utility includes
 #include <utils/Logger.h>
+#include <utils/WeakConnect.h>
 
 namespace {
 	constexpr std::chrono::milliseconds DEFAULT_DISCOVER_TIMEOUT{ 500 };
@@ -103,24 +104,6 @@ private slots:
 	void onServiceRemoved(const QMdnsEngine::Service& service);
 
 private:
-
-	template <typename Func1, typename Func2, typename std::enable_if_t<!std::is_member_pointer<Func2>::value, int> = 0>
-	static inline QMetaObject::Connection weakConnect(typename QtPrivate::FunctionPointer<Func1>::Object* sender,
-		Func1 signal,
-		Func2 slot)
-	{
-		QMetaObject::Connection conn_normal = QObject::connect(sender, signal, slot);
-
-		QMetaObject::Connection* conn_delete = new QMetaObject::Connection();
-
-		*conn_delete = QObject::connect(sender, signal, [conn_normal, conn_delete]() {
-			QObject::disconnect(conn_normal);
-			QObject::disconnect(*conn_delete);
-			delete conn_delete;
-			});
-		return conn_normal;
-	}
-
 	/// The logger instance for mDNS-Service
 	Logger* _log;
 

diff --git a/include/utils/WeakConnect.h b/include/utils/WeakConnect.h
@@ -0,0 +1,63 @@
+#ifndef WEAKCONNECT_H
+#define WEAKCONNECT_H
+
+#include <type_traits>
+
+// Qt includes
+#include <QObject>
+
+template <typename Func1, typename Func2, typename std::enable_if_t<std::is_member_pointer<Func2>::value, int> = 0>
+static inline QMetaObject::Connection weakConnect(typename QtPrivate::FunctionPointer<Func1>::Object* sender,
+												  Func1 signal,
+												  typename QtPrivate::FunctionPointer<Func2>::Object* receiver,
+												  Func2 slot)
+{
+	QMetaObject::Connection conn_normal = QObject::connect(sender, signal, receiver, slot);
+
+	QMetaObject::Connection* conn_delete = new QMetaObject::Connection();
+
+	*conn_delete = QObject::connect(sender, signal, [conn_normal, conn_delete]() {
+		QObject::disconnect(conn_normal);
+		QObject::disconnect(*conn_delete);
+		delete conn_delete;
+	});
+	return conn_normal;
+}
+
+template <typename Func1, typename Func2, typename std::enable_if_t<!std::is_member_pointer<Func2>::value, int> = 0>
+static inline QMetaObject::Connection weakConnect(typename QtPrivate::FunctionPointer<Func1>::Object* sender,
+												  Func1 signal,
+												  Func2 slot)
+{
+	QMetaObject::Connection conn_normal = QObject::connect(sender, signal, slot);
+
+	QMetaObject::Connection* conn_delete = new QMetaObject::Connection();
+
+	*conn_delete = QObject::connect(sender, signal, [conn_normal, conn_delete]() {
+		QObject::disconnect(conn_normal);
+		QObject::disconnect(*conn_delete);
+		delete conn_delete;
+	});
+	return conn_normal;
+}
+
+template <typename Func1, typename Func2, typename std::enable_if_t<!std::is_member_pointer<Func2>::value, int> = 0>
+static inline QMetaObject::Connection weakConnect(typename QtPrivate::FunctionPointer<Func1>::Object* sender,
+												  Func1 signal,
+												  typename QtPrivate::FunctionPointer<Func2>::Object* receiver,
+												  Func2 slot)
+{
+	Q_UNUSED(receiver);
+	QMetaObject::Connection conn_normal = QObject::connect(sender, signal, slot);
+
+	QMetaObject::Connection* conn_delete = new QMetaObject::Connection();
+
+	*conn_delete = QObject::connect(sender, signal, [conn_normal, conn_delete]() {
+		QObject::disconnect(conn_normal);
+		QObject::disconnect(*conn_delete);
+		delete conn_delete;
+	});
+	return conn_normal;
+}
+
+#endif // WEAKCONNECT_H
diff --git a/libsrc/api/JsonAPI.cpp b/libsrc/api/JsonAPI.cpp
@@ -21,6 +21,8 @@
 #include <hyperion/GrabberWrapper.h>
 #include <grabber/QtGrabber.h>
 
+#include <utils/WeakConnect.h>
+
 #if defined(ENABLE_MF)
 	#include <grabber/MFGrabber.h>
 #elif defined(ENABLE_V4L2)
@@ -1453,7 +1455,7 @@ void JsonAPI::handleAuthorizeCommand(const QJsonObject &message, const QString &
 void JsonAPI::handleInstanceCommand(const QJsonObject &message, const QString &command, int tan)
 {
 	const QString &subc = message["subcommand"].toString();
-	const quint8 &inst = message["instance"].toInt();
+	const quint8 &inst = static_cast<quint8>(message["instance"].toInt());
 	const QString &name = message["name"].toString();
 
 	if (subc == "switchTo")
@@ -1471,7 +1473,12 @@ void JsonAPI::handleInstanceCommand(const QJsonObject &message, const QString &c
 
 	if (subc == "startInstance")
 	{
-		connect(this, &API::onStartInstanceResponse, [=] (const int &tan) { sendSuccessReply(command + "-" + subc, tan); });
+		//Only send update once
+		weakConnect(this, &API::onStartInstanceResponse, [this, command, subc] (int tan)
+		{
+			sendSuccessReply(command + "-" + subc, tan);
+		});
+
 		if (!API::startInstance(inst, tan))
 			sendErrorReply("Can't start Hyperion instance index " + QString::number(inst), command + "-" + subc, tan);