summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorpeavey <peavey@e03df62e-2008-0410-955e-edbf42e46eb7>2006-12-25 20:32:37 +0000
committerpeavey <peavey@e03df62e-2008-0410-955e-edbf42e46eb7>2006-12-25 20:32:37 +0000
commit1bbe35d493556fd7e6bc2b0b7df3ea888fae8b74 (patch)
tree17987039ec33b5e52702acbdd244923adc4d433c /src
parenta6bb2c203986c53583f64f3fc5c7c0923b30f31e (diff)
Fix m_httpd always crashing in destructor if no active Timeout.
git-svn-id: http://svn.inspircd.org/repository/trunk/inspircd@6112 e03df62e-2008-0410-955e-edbf42e46eb7
Diffstat (limited to 'src')
-rw-r--r--src/modules/m_httpd.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/m_httpd.cpp b/src/modules/m_httpd.cpp
index d6c943828..2606f77ad 100644
--- a/src/modules/m_httpd.cpp
+++ b/src/modules/m_httpd.cpp
@@ -92,9 +92,9 @@ class HttpSocket : public InspSocket
~HttpSocket()
{
- if (Instance->Time() < Timeout->GetTimer())
+ if (Timeout)
{
- if (Timeout)
+ if (Instance->Time() < Timeout->GetTimer())
Instance->Timers->DelTimer(Timeout);
Timeout = NULL;
}