Check _sniDBusProxy for nullptr before connecting to signals

This commit is contained in:
Ilya Fedin 2021-01-15 14:46:13 +04:00 committed by John Preston
parent bad888496c
commit 1e2759840d

View file

@ -528,11 +528,13 @@ void MainWindow::initHook() {
nullptr, nullptr,
nullptr); nullptr);
if (_sniDBusProxy) {
g_signal_connect( g_signal_connect(
_sniDBusProxy, _sniDBusProxy,
"g-signal", "g-signal",
G_CALLBACK(sniSignalEmitted), G_CALLBACK(sniSignalEmitted),
nullptr); nullptr);
}
auto sniWatcher = new QDBusServiceWatcher( auto sniWatcher = new QDBusServiceWatcher(
kSNIWatcherService.utf16(), kSNIWatcherService.utf16(),
@ -1232,7 +1234,9 @@ MainWindow::~MainWindow() {
delete _mainMenuExporter; delete _mainMenuExporter;
delete psMainMenu; delete psMainMenu;
if (_sniDBusProxy) {
g_object_unref(_sniDBusProxy); g_object_unref(_sniDBusProxy);
}
#endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION #endif // !DESKTOP_APP_DISABLE_DBUS_INTEGRATION
} }