X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fnicklistwidget.cpp;h=aae3288127056c17dd0de3be567185fa81c5afad;hp=e11d312b6e0b59e2e672f54315a6f419977df2ed;hb=a700bd999215313b075ced5a1e3ba4ea8917fbbc;hpb=a95ad2de573027f9bee36db972bcae4195168d0c

diff --git a/src/qtui/nicklistwidget.cpp b/src/qtui/nicklistwidget.cpp
index e11d312b..aae32881 100644
--- a/src/qtui/nicklistwidget.cpp
+++ b/src/qtui/nicklistwidget.cpp
@@ -176,6 +176,10 @@ void NickListWidget::rowsAboutToBeRemoved(const QModelIndex& parent, int start,
     }
     else {
         // check if there are explicitly buffers removed
+        // Make sure model is valid first
+        if (!parent.model()) {
+            return;
+        }
         for (int i = start; i <= end; i++) {
             QVariant variant = parent.model()->index(i, 0, parent).data(NetworkModel::BufferIdRole);
             if (!variant.isValid())
@@ -234,7 +238,7 @@ NickListDock::NickListDock(const QString& title, QWidget* parent)
 void NickListDock::setLocked(bool locked)
 {
     if (locked) {
-        setFeatures(nullptr);
+        setFeatures({});
     }
     else {
         setFeatures(QDockWidget::DockWidgetClosable | QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetFloatable);