--- np2/win9x/sysmng.cpp	2003/10/16 17:58:48	1.1
+++ np2/win9x/sysmng.cpp	2005/02/07 14:46:14	1.9
@@ -2,10 +2,10 @@
 #include	"np2.h"
 #include	"dosio.h"
 #include	"sysmng.h"
+#include	"cpucore.h"
 #include	"pccore.h"
 #include	"fddfile.h"
 
-
 	UINT	sys_updates;
 
 
@@ -25,7 +25,7 @@ static struct {
 void sysmng_workclockreset(void) {
 
 	workclock.tick = GETTICK();
-	workclock.clock = nevent.clock;
+	workclock.clock = CPU_CLOCK;
 	workclock.draws = drawcount;
 }
 
@@ -40,12 +40,12 @@ BOOL sysmng_workclockrenewal(void) {
 	workclock.tick += tick;
 	workclock.fps = ((drawcount - workclock.draws) * 10000) / tick;
 	workclock.draws = drawcount;
-	workclock.khz = (nevent.clock - workclock.clock) / tick;
-	workclock.clock = nevent.clock;
+	workclock.khz = (CPU_CLOCK - workclock.clock) / tick;
+	workclock.clock = CPU_CLOCK;
 	return(TRUE);
 }
 
-void sysmng_updatecaption(BYTE flag) {
+void sysmng_updatecaption(UINT8 flag) {
 
 	char	work[512];
 
@@ -65,11 +65,13 @@ void sysmng_updatecaption(BYTE flag) {
 	if (flag & 2) {
 		clock[0] = '\0';
 		if (np2oscfg.DISPCLK & 2) {
-			SPRINTF(clock, " - %u.%1uFPS",
-								workclock.fps / 10, workclock.fps % 10);
-		}
-		else {
-			milstr_ncpy(clock, " - 0FPS", sizeof(clock));
+			if (workclock.fps) {
+				SPRINTF(clock, " - %u.%1uFPS",
+									workclock.fps / 10, workclock.fps % 10);
+			}
+			else {
+				milstr_ncpy(clock, " - 0FPS", sizeof(clock));
+			}
 		}
 		if (np2oscfg.DISPCLK & 1) {
 			SPRINTF(work, " %2u.%03uMHz",
@@ -78,6 +80,11 @@ void sysmng_updatecaption(BYTE flag) {
 				milstr_ncpy(clock, " -", sizeof(clock));
 			}
 			milstr_ncat(clock, work, sizeof(clock));
+#if 0
+			SPRINTF(work, " (debug: OPN %d / PSG %s)", opngen.playing,
+									(psg1.mixer & 0x3f)?"ON":"OFF");
+			milstr_ncat(clock, work, sizeof(clock));
+#endif
 		}
 	}
 	milstr_ncpy(work, np2oscfg.titles, sizeof(work));