projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clang-tidy: Avoid potential memory leak in QtUi
[quassel.git]
/
src
/
core
/
coresession.cpp
diff --git
a/src/core/coresession.cpp
b/src/core/coresession.cpp
index
929895a
..
c81ac89
100644
(file)
--- a/
src/core/coresession.cpp
+++ b/
src/core/coresession.cpp
@@
-44,7
+44,7
@@
#include "ircchannel.h"
#include "ircparser.h"
#include "ircuser.h"
#include "ircchannel.h"
#include "ircparser.h"
#include "ircuser.h"
-#include "log
ger
.h"
+#include "log
message
.h"
#include "messageevent.h"
#include "remotepeer.h"
#include "storage.h"
#include "messageevent.h"
#include "remotepeer.h"
#include "storage.h"
@@
-131,7
+131,7
@@
CoreSession::CoreSession(UserId uid, bool restoreState, bool strictIdentEnabled,
eventManager()->registerObject(ctcpParser(), EventManager::LowPriority, "send");
// periodically save our session state
eventManager()->registerObject(ctcpParser(), EventManager::LowPriority, "send");
// periodically save our session state
- connect(
&(Core::instance()->syncTimer()
), SIGNAL(timeout()), this, SLOT(saveSessionState()));
+ connect(
Core::instance()->syncTimer(
), SIGNAL(timeout()), this, SLOT(saveSessionState()));
p->synchronize(_bufferSyncer);
p->synchronize(&aliasManager());
p->synchronize(_bufferSyncer);
p->synchronize(&aliasManager());
@@
-142,6
+142,9
@@
CoreSession::CoreSession(UserId uid, bool restoreState, bool strictIdentEnabled,
p->synchronize(_coreInfo);
p->synchronize(&_ignoreListManager);
p->synchronize(&_highlightRuleManager);
p->synchronize(_coreInfo);
p->synchronize(&_ignoreListManager);
p->synchronize(&_highlightRuleManager);
+ // Listen to network removed events
+ connect(this, SIGNAL(networkRemoved(NetworkId)),
+ &_highlightRuleManager, SLOT(networkRemoved(NetworkId)));
p->synchronize(transferManager());
// Restore session state
if (restoreState)
p->synchronize(transferManager());
// Restore session state
if (restoreState)
@@
-345,7
+348,8
@@
void CoreSession::recvMessageFromServer(NetworkId networkId, Message::Type type,
if (_ignoreListManager.match(rawMsg, networkName) == IgnoreListManager::HardStrictness)
return;
if (_ignoreListManager.match(rawMsg, networkName) == IgnoreListManager::HardStrictness)
return;
- if (_highlightRuleManager.match(rawMsg, currentNetwork->myNick(), currentNetwork->identityPtr()->nicks()))
+
+ if (currentNetwork && _highlightRuleManager.match(rawMsg, currentNetwork->myNick(), currentNetwork->identityPtr()->nicks()))
rawMsg.flags |= Message::Flag::Highlight;
_messageQueue << rawMsg;
rawMsg.flags |= Message::Flag::Highlight;
_messageQueue << rawMsg;