From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Thu, 15 Jan 2009 19:45:15 +0000 (+0100)
Subject: Properly initialize _messageFilter in all cases, fixes #482
X-Git-Tag: 0.4.0~215
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=7ff0e773f78ed00e5f039fa8b2ec2913b8bc84a5;hp=86d792a90e2868635170a1092ac7a9278a84ef71

Properly initialize _messageFilter in all cases, fixes #482

Thanks to EgS for pointing me to the root of the issue.
---

diff --git a/src/uisupport/networkmodelactionprovider.cpp b/src/uisupport/networkmodelactionprovider.cpp
index 6061e382..149ef698 100644
--- a/src/uisupport/networkmodelactionprovider.cpp
+++ b/src/uisupport/networkmodelactionprovider.cpp
@@ -169,9 +169,14 @@ void NetworkModelActionProvider::addActions(QMenu *menu, MessageFilter *filter,
   addActions(menu, QList<QModelIndex>() << Client::networkModel()->bufferIndex(msgBuffer), receiver, method);
 }
 
+void NetworkModelActionProvider::addActions(QMenu *menu, const QList<QModelIndex> &indexList, QObject *receiver,  const char *method, bool isCustomBufferView) {
+  addActions(menu, indexList, 0, receiver, method, isCustomBufferView);
+}
+
 // add a list of actions sensible for the current item(s)
 void NetworkModelActionProvider::addActions(QMenu *menu,
                                             const QList<QModelIndex> &indexList,
+                                            MessageFilter *filter,
                                             QObject *receiver,
                                             const char *method,
                                             bool isCustomBufferView)
@@ -180,6 +185,7 @@ void NetworkModelActionProvider::addActions(QMenu *menu,
     return;
 
   _indexList = indexList;
+  _messageFilter = filter;
   _receiver = receiver;
   _method = method;
 
diff --git a/src/uisupport/networkmodelactionprovider.h b/src/uisupport/networkmodelactionprovider.h
index 2a44724e..10cdebc6 100644
--- a/src/uisupport/networkmodelactionprovider.h
+++ b/src/uisupport/networkmodelactionprovider.h
@@ -138,6 +138,8 @@ private:
   void handleGeneralAction(ActionType, QAction *);
   void handleExternalAction(ActionType, QAction *);
 
+  void addActions(QMenu *, const QList<QModelIndex> &indexList, MessageFilter *filter, QObject *receiver, const char *slot, bool allowBufferHide);
+
   bool checkRequirements(const QModelIndex &index, ItemActiveStates requiredActiveState = QFlags<ItemActiveState>(ActiveState | InactiveState));
   Action * addAction(ActionType, QMenu *, bool condition = true);
   Action * addAction(Action * , QMenu *, bool condition = true);