X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fircevent.cpp;h=797f453831a474760ccbaa3b3d7f60823ee55090;hp=fe0ece5f71a77c6f95dc40f0e95df0fbef202319;hb=8582c2ad5708a1972c85bea1cf8d81ad3ece4814;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce

diff --git a/src/common/ircevent.cpp b/src/common/ircevent.cpp
index fe0ece5f..797f4538 100644
--- a/src/common/ircevent.cpp
+++ b/src/common/ircevent.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2012 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,18 +15,18 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "ircevent.h"
 
 Event *IrcEvent::create(EventManager::EventType type, QVariantMap &map, Network *network)
 {
-    if ((type & EventManager::IrcEventNumericMask) == EventManager::IrcEventNumeric)
+    if ((type & ~EventManager::IrcEventNumericMask) == EventManager::IrcEventNumeric)
         return new IrcEventNumeric(type, map, network);
 
     if ((type & EventManager::EventGroupMask) != EventManager::IrcEvent)
-        return 0;
+        return nullptr;
 
     switch (type) {
     case EventManager::IrcEventRawPrivmsg: