ui/simpledesk: fix disconnect with NULL argument

mcallegari · Aug 9, 2018 · 03ef9b2 · 03ef9b2
1 parent 3047163
commit 03ef9b2
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/ui/src/simpledesk.cpp b/ui/src/simpledesk.cpp
@@ -597,8 +597,11 @@ void SimpleDesk::slotViewModeClicked(bool toggle)
                 if (fxRemoveList.contains(slider->fixture()) == false)
                 {
                     Fixture *currFx = m_doc->fixture(slider->fixture());
-                    disconnect(currFx, SIGNAL(aliasChanged()), this, SLOT(slotAliasChanged()));
-                    fxRemoveList.append(slider->fixture());
+                    if (currFx != NULL)
+                    {
+                        disconnect(currFx, SIGNAL(aliasChanged()), this, SLOT(slotAliasChanged()));
+                        fxRemoveList.append(slider->fixture());
+                    }
                 }
                 delete slider;
                 m_universeSliders[i] = NULL;
@@ -657,8 +660,11 @@ void SimpleDesk::slotUniversePageChanged(int page)
             if (fxRemoveList.contains(slider->fixture()) == false)
             {
                 Fixture *currFx = m_doc->fixture(slider->fixture());
-                disconnect(currFx, SIGNAL(aliasChanged()), this, SLOT(slotAliasChanged()));
-                fxRemoveList.append(slider->fixture());
+                if (currFx != NULL)
+                {
+                    disconnect(currFx, SIGNAL(aliasChanged()), this, SLOT(slotAliasChanged()));
+                    fxRemoveList.append(slider->fixture());
+                }
             }
             delete slider;
             m_universeSliders[i] = NULL;