--- SheepShaver/src/timer.cpp	2005/07/01 23:15:11	1.7
+++ SheepShaver/src/timer.cpp	2009/08/01 07:02:41	1.11
@@ -1,7 +1,7 @@
 /*
  *  timer.cpp - Time Manager emulation
  *
- *  SheepShaver (C) 1997-2005 Christian Bauer and Marc Hellwig
+ *  SheepShaver (C) 1997-2008 Christian Bauer and Marc Hellwig
  *
  *  This program is free software; you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -18,10 +18,6 @@
  *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-/*
- * TODO: Prime(0)
- */
-
 #include "sysdeps.h"
 #include "timer.h"
 #include "macos_util.h"
@@ -428,11 +424,12 @@ int16 PrimeTime(uint32 tm, int32 time)
 		// Yes, tmWakeUp set?
 		if (ReadMacInt32(tm + tmWakeUp)) {
 
-			//!! PrimeTime(0) means continue previous delay
-			// (save wakeup time in RmvTime?)
+			// PrimeTime(0) can either mean (a) "the task runs as soon as interrupts are enabled"
+			// or (b) "continue previous delay" if an expired task was stopped via RmvTime() and
+			// then re-installed using InsXTime(). Since tmWakeUp was set, this is case (b).
+			// The remaining time was saved in tmCount by RmvTime().
 			if (time == 0) {
-				printf("FATAL: Unsupported PrimeTime(0)\n");
-				return 0;
+				timer_mac2host_time(delay, ReadMacInt16(tm + tmCount));
 			}
 
 			// Yes, calculate wakeup time relative to last scheduled time