From eb2608ffd2a682ab5dd5c5b03b1bf29fc060efe6 Mon Sep 17 00:00:00 2001
From: Greg Taylor <snagglepants@gmail.com>
Date: Mon, 6 Apr 2009 17:15:35 +0000
Subject: [PATCH] Prevent an error in @ps being used before the events have
 triggered the first time.

---
 src/events.py    | 8 ++++++++
 src/scheduler.py | 7 -------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/events.py b/src/events.py
index 3f3e68ac7b..c91689bc09 100644
--- a/src/events.py
+++ b/src/events.py
@@ -24,6 +24,14 @@ class IntervalEvent(object):
     # A reference to the task.LoopingCall object.
     looped_task = None
     
+    def __init__(self):
+        """
+        Executed when the class is instantiated.
+        """
+        # This is set to prevent a Nonetype exception on @ps before the
+        # event is fired for the first time.
+        self.time_last_executed = time.time()
+    
     def __unicode__(self):
         """
         String representation of the event.
diff --git a/src/scheduler.py b/src/scheduler.py
index fcbbca8988..d7121fc9cf 100644
--- a/src/scheduler.py
+++ b/src/scheduler.py
@@ -9,13 +9,6 @@ ADDING AN EVENT:
 
 # List of IntervalEvent sub-classed objects.
 schedule = []
-
-def start_events():
-    """
-    Start the event system, which is built on Twisted's framework.
-    """
-    for event in schedule:
-        event.start_event_loop()
         
 def add_event(event):
     """