--- np2/macosx/np2.cpp	2003/11/03 10:19:43	1.27
+++ np2/macosx/np2.cpp	2003/11/05 17:58:01	1.30
@@ -37,7 +37,7 @@
 #include	"midiopt.h"
 #include	"macalert.h"
 #include	"np2opening.h"
-#include	"toolmac.h"
+#include	"toolwin.h"
 
 #include	<QuickTime/QuickTime.h>
 #define	USE_RESUME
@@ -765,7 +765,6 @@ int main(int argc, char *argv[]) {
         toggleFullscreen();
     }
     
-    toolwin_writeini();
 	pccore_cfgupdate();
 
 #if defined(USE_RESUME)
@@ -789,7 +788,8 @@ int main(int argc, char *argv[]) {
 	scrnmng_destroy();
 
 	if (sys_updates & (SYS_UPDATECFG | SYS_UPDATEOSCFG)) {
-		initsave();
+		initsave();						// np2.cfg create
+	    toolwin_writeini();				// np2.cfg append
 	}
 	TRACETERM();
 	macossub_term();
@@ -920,6 +920,9 @@ static pascal OSStatus np2windowevent(Ev
                     case kEventWindowDragCompleted:
                         soundmng_play();
                         break;
+                    case kEventWindowShown:
+                        scrndraw_redraw();
+                        break;
                 }
                 break;
             case kEventClassKeyboard:
@@ -988,6 +991,7 @@ static const EventTypeSpec windEventList
 				{kEventClassWindow,		kEventWindowToolbarSwitchMode},
 				{kEventClassWindow,		kEventWindowDragStarted},
 				{kEventClassWindow,		kEventWindowDragCompleted},
+				{kEventClassWindow,		kEventWindowShown},
 				{kEventClassKeyboard,	kEventRawKeyDown},
 				{kEventClassKeyboard,	kEventRawKeyUp},
 				{kEventClassKeyboard,	kEventRawKeyRepeat},