From 5ac1ffce1168c4e3409e6667ff30285bfbc82bde Mon Sep 17 00:00:00 2001
From: Attila Molnar
Date: Thu, 30 Jan 2014 21:44:51 +0100
Subject: Allow Timers to delete themselves in Tick()

---
 include/modules/dns.h | 1 +
 include/timer.h       | 2 ++
 2 files changed, 3 insertions(+)

(limited to 'include')

diff --git a/include/modules/dns.h b/include/modules/dns.h
index 905e52a34..7f863fcca 100644
--- a/include/modules/dns.h
+++ b/include/modules/dns.h
@@ -185,6 +185,7 @@ namespace DNS
 			Query rr(*this);
 			rr.error = ERROR_TIMEDOUT;
 			this->OnError(&rr);
+			delete this;
 			return false;
 		}
 	};
diff --git a/include/timer.h b/include/timer.h
index 2887e2b52..503fa82a2 100644
--- a/include/timer.h
+++ b/include/timer.h
@@ -87,6 +87,8 @@ class CoreExport Timer
 	/** Called when the timer ticks.
 	 * You should override this method with some useful code to
 	 * handle the tick event.
+	 * @param TIME The current time.
+	 * @return True if the Timer object is still valid, false if it was destructed.
 	 */
 	virtual bool Tick(time_t TIME) = 0;
 
-- 
cgit v1.3.1-10-gc9f91