summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-03-09 00:02:12 +0000
committerbrain <brain@e03df62e-2008-0410-955e-edbf42e46eb7>2006-03-09 00:02:12 +0000
commitcdf14e8f5e9824052601acc6d35c3f7567942a8f (patch)
tree527fb98a2552a5ab210cabfeb5cc78f6671ea1b1 /src
parenta1daff1996dfbfa5945ee947b2398bc3185f1184 (diff)
Calling a method of a null object due to refactoring and HasUser - fixed
(Thanks Douglas) git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@3565 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src')
-rw-r--r--src/modules/m_safelist.cpp2
-rwxr-xr-xsrc/svn-rev.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/m_safelist.cpp b/src/modules/m_safelist.cpp
index 6e1789097..64f073386 100644
--- a/src/modules/m_safelist.cpp
+++ b/src/modules/m_safelist.cpp
@@ -97,7 +97,7 @@ class ListTimer : public InspTimer
WriteServ(u->fd,"321 %s Channel :Users Name",u->nick);
chan = Srv->GetChannelIndex(ld->list_position);
/* spool details */
- bool has_user = chan->HasUser(u);
+ bool has_user = (u && chan->HasUser(u));
if ((chan) && (((!(chan->binarymodes & CM_PRIVATE)) && (!(chan->binarymodes & CM_SECRET))) || (has_user)))
{
/* Increment total plus linefeed */
diff --git a/src/svn-rev.sh b/src/svn-rev.sh
index 1a7209991..fb80af124 100755
--- a/src/svn-rev.sh
+++ b/src/svn-rev.sh
@@ -1 +1 @@
-echo 3559
+echo 3563