X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoresession.cpp;h=3c8e20c67a573f5ef6fee25103983cb502620cf4;hb=af51f89732ca38ed2d645d4ffbea85ed5fe9ef45;hp=433abbff8a1eb0e6b15561ec5cb7a132e5f10a45;hpb=22d6ab71ce70b20f2d2657a27e968570b3dcb837;p=quassel.git

diff --git a/src/core/coresession.cpp b/src/core/coresession.cpp
index 433abbff..3c8e20c6 100644
--- a/src/core/coresession.cpp
+++ b/src/core/coresession.cpp
@@ -22,7 +22,7 @@
 
 #include "core.h"
 #include "coresession.h"
-#include "userinputhandler.h"
+#include "coreuserinputhandler.h"
 #include "signalproxy.h"
 #include "corebuffersyncer.h"
 #include "corebacklogmanager.h"
@@ -154,8 +154,6 @@ void CoreSession::saveSessionState() const {
   _bufferSyncer->storeDirtyIds();
   _bufferViewManager->saveBufferViews();
   _networkConfig->save();
-  _aliasManager.save();
-  _ignoreListManager.save();
 }
 
 void CoreSession::restoreSessionState() {
@@ -251,7 +249,8 @@ void CoreSession::processMessages() {
     BufferInfo bufferInfo = Core::bufferInfo(user(), rawMsg.networkId, rawMsg.bufferType, rawMsg.target);
     Message msg(bufferInfo, rawMsg.type, rawMsg.text, rawMsg.sender, rawMsg.flags);
 
-    networkName = _networks.value(bufferInfo.networkId())->networkName();
+    CoreNetwork *currentNetwork = network(bufferInfo.networkId());
+    networkName = currentNetwork ? currentNetwork->networkName() : QString("");
     // if message is ignored with "HardStrictness" we discard it here
     if(_ignoreListManager.match(msg, networkName) != IgnoreListManager::HardStrictness) {
       Core::storeMessage(msg);
@@ -271,7 +270,8 @@ void CoreSession::processMessages() {
       }
 
       Message msg(bufferInfo, rawMsg.type, rawMsg.text, rawMsg.sender, rawMsg.flags);
-      networkName = _networks.value(bufferInfo.networkId())->networkName();
+      CoreNetwork *currentNetwork = network(bufferInfo.networkId());
+      networkName = currentNetwork ? currentNetwork->networkName() : QString("");
       // if message is ignored with "HardStrictness" we discard it here
       if(_ignoreListManager.match(msg, networkName) == IgnoreListManager::HardStrictness)
         continue;