From 48dd54ab7800990f09616d8f44ba6a9e383defd6 Mon Sep 17 00:00:00 2001
From: LordGrey <lordgrey.emmel@gmail.com>
Date: Wed, 19 Apr 2023 19:29:46 +0200
Subject: [PATCH] Fix - Audio Capture enabled after reboot automatically
 (#1581)

---
 libsrc/hyperion/CaptureCont.cpp    | 6 +++---
 libsrc/hyperion/GrabberWrapper.cpp | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libsrc/hyperion/CaptureCont.cpp b/libsrc/hyperion/CaptureCont.cpp
index 4f3a7aae..5ae2a9e5 100644
--- a/libsrc/hyperion/CaptureCont.cpp
+++ b/libsrc/hyperion/CaptureCont.cpp
@@ -97,7 +97,7 @@ void CaptureCont::setSystemCaptureEnable(bool enable)
 		}
 		else
 		{
-			disconnect(GlobalSignals::getInstance(), &GlobalSignals::setSystemImage, this, 0);
+			disconnect(GlobalSignals::getInstance(), &GlobalSignals::setSystemImage, this, nullptr);
 			_hyperion->clear(_systemCaptPrio);
 			_systemInactiveTimer->stop();
 			_systemCaptName = "";
@@ -120,7 +120,7 @@ void CaptureCont::setV4LCaptureEnable(bool enable)
 		}
 		else
 		{
-			disconnect(GlobalSignals::getInstance(), &GlobalSignals::setV4lImage, this, 0);
+			disconnect(GlobalSignals::getInstance(), &GlobalSignals::setV4lImage, this, nullptr);
 			_hyperion->clear(_v4lCaptPrio);
 			_v4lInactiveTimer->stop();
 			_v4lCaptName = "";
@@ -143,7 +143,7 @@ void CaptureCont::setAudioCaptureEnable(bool enable)
 		}
 		else
 		{
-			disconnect(GlobalSignals::getInstance(), &GlobalSignals::setAudioImage, this, 0);
+			disconnect(GlobalSignals::getInstance(), &GlobalSignals::setAudioImage, this, nullptr);
 			_hyperion->clear(_audioCaptPrio);
 			_audioInactiveTimer->stop();
 			_audioCaptName = "";
diff --git a/libsrc/hyperion/GrabberWrapper.cpp b/libsrc/hyperion/GrabberWrapper.cpp
index 4d88a6f2..e0e4a27c 100644
--- a/libsrc/hyperion/GrabberWrapper.cpp
+++ b/libsrc/hyperion/GrabberWrapper.cpp
@@ -290,7 +290,7 @@ void GrabberWrapper::handleSourceRequest(hyperion::Components component, int hyp
 		else
 			GRABBER_AUDIO_CLIENTS.remove(hyperionInd);
 
-		if (GRABBER_AUDIO_CLIENTS.empty())
+		if (GRABBER_AUDIO_CLIENTS.empty() || !getAudioGrabberState())
 			stop();
 		else
 			start();