From a02594e577806180f6bb002d7aad98dee7c47955 Mon Sep 17 00:00:00 2001
From: Mike Goslin <mikegoslin@users.sourceforge.net>
Date: Wed, 14 Mar 2001 22:33:48 +0000
Subject: [PATCH] *** empty log message ***

---
 direct/src/gui/ForceAcknowledge.py |  2 +-
 direct/src/task/Timer.py           | 16 ++++++++++++++--
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/direct/src/gui/ForceAcknowledge.py b/direct/src/gui/ForceAcknowledge.py
index c533032194..ca5a8d9c6d 100644
--- a/direct/src/gui/ForceAcknowledge.py
+++ b/direct/src/gui/ForceAcknowledge.py
@@ -23,7 +23,7 @@ class ForceAcknowledge(StateData.StateData):
 
 	if self.text:
 	    self.text.setText(message)
-	    self.text.reparentTo(render2d)
+	    self.text.reparentTo(aspect2d)
 
 	if self.okButton:
 	    self.okButton.manage()
diff --git a/direct/src/task/Timer.py b/direct/src/task/Timer.py
index f4dbe1681a..fb0d61ffe5 100644
--- a/direct/src/task/Timer.py
+++ b/direct/src/task/Timer.py
@@ -7,13 +7,20 @@ class Timer:
 	""" __init__()
 	"""
 	self.clock = ClockObject.ClockObject.getGlobalClock()
+	self.finalT = 0.0
+	self.currT = 0.0
+	self.name = 'default-timer'
+	self.started = 0
 
     def start(self, t, name):
 	""" start(t, name)
 	"""
+	if (self.started):
+	    self.stop()
 	self.finalT = t
 	self.name = name
 	self.startT = self.clock.getFrameTime()
+	self.currT = 0.0
 	taskMgr.spawnMethodNamed(self.__timerTask, self.name + '-run')
 	self.started = 1
 
@@ -26,13 +33,18 @@ class Timer:
 	self.started = 0
 	return self.currT
 
-    def restart(self):
-	""" restart()
+    def resume(self):
+	""" resume()
 	"""
 	assert(self.currT <= self.finalT)
 	assert(self.started == 0)
 	self.start(self.finalT - self.currT, self.name)
 
+    def restart(self):
+	""" restart()
+	"""
+	self.start(self.finalT, self.name)
+
     def isStarted(self):
 	""" isStarted()
 	"""