From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Mon, 12 Jan 2009 20:59:11 +0000 (+0100)
Subject: Fix an issue where active query buffer couldn't be deleted
X-Git-Tag: 0.4.0~229
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=efb5981cf15bee1de651abcf757ab763117e82b4;hp=7e2706c4e932a00b1b62315d42258d4738fb670f

Fix an issue where active query buffer couldn't be deleted
---

diff --git a/src/uisupport/networkmodelactionprovider.cpp b/src/uisupport/networkmodelactionprovider.cpp
index a4f84e44..6061e382 100644
--- a/src/uisupport/networkmodelactionprovider.cpp
+++ b/src/uisupport/networkmodelactionprovider.cpp
@@ -504,10 +504,11 @@ void NetworkModelActionProvider::handleBufferAction(ActionType type, QAction *)
 void NetworkModelActionProvider::removeBuffers(const QModelIndexList &indexList) {
   QList<BufferInfo> inactive;
   foreach(QModelIndex index, indexList) {
-    if(!index.data(NetworkModel::ItemActiveRole).toBool()) {
-      BufferInfo info = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
-      if(info.isValid())
-        inactive << info;
+    BufferInfo info = index.data(NetworkModel::BufferInfoRole).value<BufferInfo>();
+    if(info.isValid()) {
+      if(info.type() == BufferInfo::QueryBuffer
+        || (info.type() == BufferInfo::ChannelBuffer && !index.data(NetworkModel::ItemActiveRole).toBool()))
+          inactive << info;
     }
   }
   QString msg;