Changeset 1263 for code/branches/merge/src/orxonox/tools

Timestamp:

May 13, 2008, 3:45:19 PM (17 years ago)

Author:

rgrieder

Message:

• merged ogre branch into merge branch

File:

• code/branches/merge/src/orxonox/tools/Timer.cc (modified) (3 diffs)

code/branches/merge/src/orxonox/tools/Timer.cc

@@ -68 +68 @@
     TimerBase::TimerBase()
     {
-        RegisterRootObject(TimerBase);
-
         this->executor_ = 0;
         this->interval_ = 0;
@@ -76 +74 @@
 
         this->time_ = 0;
+
+        RegisterRootObject(TimerBase);
     }
 
@@ -83 +83 @@
     TimerBase::~TimerBase()
     {
-        delete this->executor_;
+      if (this->executor_)
+          delete this->executor_;
     }