modernize: Use std::make_unique

[quassel.git] / src / qtui / channellistdlg.cpp

diff --git a/src/qtui/channellistdlg.cpp b/src/qtui/channellistdlg.cpp
index d6dde67..de872a7 100644 (file)
--- a/src/qtui/channellistdlg.cpp
+++ b/src/qtui/channellistdlg.cpp
@@ -30,11 +30,8 @@
 
 ChannelListDlg::ChannelListDlg(QWidget *parent)
     : QDialog(parent),
-    _listFinished(true),
     _ircListModel(this),
-    _sortFilter(this),
-    _simpleModeSpacer(0),
-    _advancedMode(false)
+    _sortFilter(this)
 {
     _sortFilter.setSourceModel(&_ircListModel);
     _sortFilter.setFilterCaseSensitivity(Qt::CaseInsensitive);
@@ -100,6 +97,11 @@ void ChannelListDlg::setChannelFilters(const QString &channelFilters)
 
 void ChannelListDlg::requestSearch()
 {
+    if (!_netId.isValid()) {
+        // No valid network set yet
+        return;
+    }
+
     _listFinished = false;
     enableQuery(false);
     showErrors(false);
@@ -146,7 +148,7 @@ void ChannelListDlg::setAdvancedMode(bool advanced)
         if (_simpleModeSpacer) {
             ui.searchLayout->removeItem(_simpleModeSpacer);
             delete _simpleModeSpacer;
-            _simpleModeSpacer = 0;
+            _simpleModeSpacer = nullptr;
         }
         ui.advancedModeLabel->setPixmap(icon::get("edit-clear-locationbar-rtl").pixmap(16));
     }