projects
/
quassel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0c9cd0e
)
Fixing $FU in some server handlers. ircUser() does not always return a valid pointer...
author
Manuel Nickschas
<sputnick@quassel-irc.org>
Fri, 8 Feb 2008 11:16:28 +0000
(11:16 +0000)
committer
Manuel Nickschas
<sputnick@quassel-irc.org>
Fri, 8 Feb 2008 11:16:28 +0000
(11:16 +0000)
src/core/ircserverhandler.cpp
patch
|
blob
|
history
diff --git
a/src/core/ircserverhandler.cpp
b/src/core/ircserverhandler.cpp
index
df4c65b
..
3f15015
100644
(file)
--- a/
src/core/ircserverhandler.cpp
+++ b/
src/core/ircserverhandler.cpp
@@
-417,12
+417,17
@@
void IrcServerHandler::handle301(QString prefix, QList<QByteArray> params) {
if(_whois) {
emit displayMsg(Message::Server, "", tr("[Whois] %1 is away: \"%2\"").arg(nickName).arg(awayMessage));
} else {
if(_whois) {
emit displayMsg(Message::Server, "", tr("[Whois] %1 is away: \"%2\"").arg(nickName).arg(awayMessage));
} else {
- int now = QDateTime::currentDateTime().toTime_t();
- int silenceTime = 60;
- if(ircuser && ircuser->lastAwayMessage() + silenceTime < now) {
+ if(ircuser) {
+ int now = QDateTime::currentDateTime().toTime_t();
+ int silenceTime = 60;
+ if(ircuser->lastAwayMessage() + silenceTime < now) {
+ emit displayMsg(Message::Server, params[0], tr("%1 is away: \"%2\"").arg(nickName).arg(awayMessage));
+ }
+ ircuser->setLastAwayMessage(now);
+ } else {
+ // probably should not happen
emit displayMsg(Message::Server, params[0], tr("%1 is away: \"%2\"").arg(nickName).arg(awayMessage));
}
emit displayMsg(Message::Server, params[0], tr("%1 is away: \"%2\"").arg(nickName).arg(awayMessage));
}
- ircuser->setLastAwayMessage(now);
}
}
}
}
@@
-537,13
+542,15
@@
void IrcServerHandler::handle352(QString prefix, QList<QByteArray> params) {
Q_UNUSED(prefix)
QString channel = serverDecode(params[0]);
IrcUser *ircuser = network()->ircUser(serverDecode(params[4]));
Q_UNUSED(prefix)
QString channel = serverDecode(params[0]);
IrcUser *ircuser = network()->ircUser(serverDecode(params[4]));
- ircuser->setUser(serverDecode(params[1]));
- ircuser->setHost(serverDecode(params[2]));
+ if(ircuser) {
+ ircuser->setUser(serverDecode(params[1]));
+ ircuser->setHost(serverDecode(params[2]));
- bool away = serverDecode(params[5]).startsWith("G") ? true : false;
- ircuser->setAway(away);
- ircuser->setServer(serverDecode(params[3]));
- ircuser->setRealName(serverDecode(params.last()).section(" ", 1));
+ bool away = serverDecode(params[5]).startsWith("G") ? true : false;
+ ircuser->setAway(away);
+ ircuser->setServer(serverDecode(params[3]));
+ ircuser->setRealName(serverDecode(params.last()).section(" ", 1));
+ }
emit displayMsg(Message::Server, "", tr("[Who] %1").arg(serverDecode(params).join(" ")));
}
emit displayMsg(Message::Server, "", tr("[Who] %1").arg(serverDecode(params).join(" ")));
}