Fix a segfault crash related to JSON-API grabber control (fixes #318)

awawa-dev · Aug 9, 2022 · a5ec340 · a5ec340
1 parent 90a2cfa
commit a5ec340
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/include/base/GrabberWrapper.h b/include/base/GrabberWrapper.h
@@ -80,6 +80,7 @@ private slots:
 	void StateChanged(QString device, QString videoMode);
 	void cecKeyPressed(int key);
 	void benchmarkUpdate(int status, QString message);
+	void setBrightnessContrastSaturationHue(int brightness, int contrast, int saturation, int hue);
 
 public:
 	int  getHdrToneMappingEnabled();
@@ -93,7 +94,7 @@ public slots:
 	void setFpsSoftwareDecimation(int decimation);
 	void setHdrToneMappingEnabled(int mode);
 	void setEncoding(QString enc);
-	void setBrightnessContrastSaturationHue(int brightness, int contrast, int saturation, int hue);
+	void setBrightnessContrastSaturationHueHandler(int brightness, int contrast, int saturation, int hue);
 	void setQFrameDecimation(int setQframe);
 	void handleSettingsUpdate(settings::type type, const QJsonDocument& config);
 

diff --git a/sources/base/GrabberWrapper.cpp b/sources/base/GrabberWrapper.cpp
@@ -61,7 +61,9 @@ GrabberWrapper::GrabberWrapper(const QString& grabberName, Grabber* ggrabber)
 	// listen for source requests
 	connect(GlobalSignals::getInstance(), &GlobalSignals::requestSource, this, &GrabberWrapper::handleSourceRequest);
 
-	connect(this, &GrabberWrapper::cecKeyPressed, this, &GrabberWrapper::cecKeyPressedHandler);	
+	connect(this, &GrabberWrapper::cecKeyPressed, this, &GrabberWrapper::cecKeyPressedHandler);
+
+	connect(this, &GrabberWrapper::setBrightnessContrastSaturationHue, this, &GrabberWrapper::setBrightnessContrastSaturationHueHandler);
 
 }
 
@@ -347,7 +349,7 @@ void GrabberWrapper::setEncoding(QString enc)
 		_grabber->setEncoding(enc);
 }
 
-void GrabberWrapper::setBrightnessContrastSaturationHue(int brightness, int contrast, int saturation, int hue)
+void GrabberWrapper::setBrightnessContrastSaturationHueHandler(int brightness, int contrast, int saturation, int hue)
 {
 	if (_grabber != nullptr)
 		_grabber->setBrightnessContrastSaturationHue(brightness, contrast, saturation, hue);