Merge pull request #370 from zomfg/hotfix/nogui-crash

nogui crash
psieg · Jul 12, 2020 · 1907cf1 · 1907cf1
2 parents 3a085dd + 2afa425
commit 1907cf1
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 17 deletions.
diff --git a/Software/src/LightpackApplication.cpp b/Software/src/LightpackApplication.cpp
@@ -166,7 +166,7 @@ void LightpackApplication::initializeAll(const QString & appDirPath)
 
 	initGrabManager();
 
-	if (!m_noGui)
+	if (!m_noGui && m_settingsWindow)
 	{
 		connect(m_settingsWindow, SIGNAL(backlightStatusChanged(Backlight::Status)), this, SLOT(setStatusChanged(Backlight::Status)));
 		m_settingsWindow->startBacklight();
@@ -227,7 +227,7 @@ void LightpackApplication::setBacklightChanged(Lightpack::Mode mode)
 {
 	DEBUG_LOW_LEVEL << Q_FUNC_INFO << mode;
 	Settings::setLightpackMode(mode);
-	if (!m_noGui)
+	if (!m_noGui && m_settingsWindow)
 		m_settingsWindow->setModeChanged(mode);
 
 	// In ApiPersist mode, we keep the colors left behind by API until the Backlight is restarted by some action
@@ -704,7 +704,7 @@ void LightpackApplication::initGrabManager()
 	m_moodlampManager->initFromSettings();
 
 #ifdef SOUNDVIZ_SUPPORT
-	m_soundManager = SoundManagerBase::create(m_settingsWindow->winId(), NULL);
+	m_soundManager = SoundManagerBase::create((!m_noGui && m_settingsWindow) ? m_settingsWindow->winId() : 0, NULL);
 	if (m_soundManager)
 		m_soundManager->initFromSettings();
 	else
@@ -757,7 +757,7 @@ void LightpackApplication::initGrabManager()
 #endif
 
 	// Connections to signals which will be connected to ILedDevice
-	if (!m_noGui)
+	if (!m_noGui && m_settingsWindow)
 	{
 		connect(m_settingsWindow, SIGNAL(showLedWidgets(bool)), this, SLOT(showLedWidgets(bool)));
 		connect(m_settingsWindow, SIGNAL(setColoredLedWidget(bool)), this, SLOT(setColoredLedWidget(bool)));
@@ -783,13 +783,15 @@ void LightpackApplication::initGrabManager()
 
 	connect(m_grabManager,		SIGNAL(updateLedsColors(const QList<QRgb> &)),	m_ledDeviceManager, SLOT(setColors(QList<QRgb>)), Qt::QueuedConnection);
 	connect(m_moodlampManager,	SIGNAL(updateLedsColors(const QList<QRgb> &)),	m_ledDeviceManager, SLOT(setColors(QList<QRgb>)), Qt::QueuedConnection);
-	connect(m_moodlampManager,	SIGNAL(moodlampFrametime(const double)),		m_settingsWindow, 	SLOT(refreshAmbilightEvaluated(double)), Qt::QueuedConnection);
+	if (!m_noGui && m_settingsWindow)
+		connect(m_moodlampManager,	SIGNAL(moodlampFrametime(const double)),		m_settingsWindow, 	SLOT(refreshAmbilightEvaluated(double)), Qt::QueuedConnection);
 	connect(m_ledDeviceManager,	SIGNAL(openDeviceSuccess(bool)),				m_grabManager,		SLOT(ledDeviceOpenSuccess(bool)), Qt::QueuedConnection);
 	connect(m_ledDeviceManager,	SIGNAL(ioDeviceSuccess(bool)),					m_grabManager,		SLOT(ledDeviceCallSuccess(bool)), Qt::QueuedConnection);
 #ifdef SOUNDVIZ_SUPPORT
 	if (m_soundManager) {
 		connect(m_soundManager,		SIGNAL(updateLedsColors(const QList<QRgb> &)),	m_ledDeviceManager, SLOT(setColors(QList<QRgb>)), Qt::QueuedConnection);
-		connect(m_soundManager,		SIGNAL(visualizerFrametime(const double)),	m_settingsWindow, SLOT(refreshAmbilightEvaluated(double)), Qt::QueuedConnection);
+		if (!m_noGui && m_settingsWindow)
+			connect(m_soundManager,		SIGNAL(visualizerFrametime(const double)),	m_settingsWindow, SLOT(refreshAmbilightEvaluated(double)), Qt::QueuedConnection);
 	}
 #endif
 }

diff --git a/Software/src/LightpackApplication.hpp b/Software/src/LightpackApplication.hpp
@@ -103,20 +103,20 @@ private slots:
 	QMutex m_mutex;
 
 private:
-	SettingsWindow *m_settingsWindow;
-	ApiServer *m_apiServer;
-	LedDeviceManager *m_ledDeviceManager;
-	QThread *m_ledDeviceManagerThread;
-	QThread *m_apiServerThread;
-	GrabManager *m_grabManager;
-	MoodLampManager *m_moodlampManager;
+	SettingsWindow *m_settingsWindow{nullptr};
+	ApiServer *m_apiServer{nullptr};
+	LedDeviceManager *m_ledDeviceManager{nullptr};
+	QThread *m_ledDeviceManagerThread{nullptr};
+	QThread *m_apiServerThread{nullptr};
+	GrabManager *m_grabManager{nullptr};
+	MoodLampManager *m_moodlampManager{nullptr};
 #ifdef SOUNDVIZ_SUPPORT
-	SoundManagerBase *m_soundManager;
+	SoundManagerBase *m_soundManager{nullptr};
 #endif
 
-	PluginsManager *m_pluginManager;
-	LightpackPluginInterface *m_pluginInterface;
-	QWidget *consolePlugin;
+	PluginsManager *m_pluginManager{nullptr};
+	LightpackPluginInterface *m_pluginInterface{nullptr};
+	QWidget *consolePlugin{nullptr};
 
 	QString m_applicationDirPath;
 	bool m_isDebugLevelObtainedFromCmdArgs;