--- BasiliskII/src/AmigaOS/main_amiga.cpp 2001/07/03 15:59:45 1.18 +++ BasiliskII/src/AmigaOS/main_amiga.cpp 2001/10/16 17:27:52 1.20 @@ -188,6 +188,12 @@ int main(int argc, char **argv) QuitEmulator(); } + if (FindTask((UBYTE *) "« Enforcer »")) + { + ErrorAlert(STR_ENFORCER_RUNNING_ERR); + QuitEmulator(); + } + // These two can fail (the respective gfx support won't be available, then) P96Base = OpenLibrary((UBYTE *)"Picasso96API.library", 2); CyberGfxBase = OpenLibrary((UBYTE *)"cybergraphics.library", 2); @@ -598,14 +604,14 @@ static __saveds void tick_func(void) static __saveds void xpram_func(void) { - uint8 last_xpram[256]; - memcpy(last_xpram, XPRAM, 256); + uint8 last_xpram[XPRAM_SIZE]; + memcpy(last_xpram, XPRAM, XPRAM_SIZE); while (xpram_proc_active) { for (int i=0; i<60 && xpram_proc_active; i++) Delay(50); // Only wait 1 second so we quit promptly when xpram_proc_active becomes false - if (memcmp(last_xpram, XPRAM, 256)) { - memcpy(last_xpram, XPRAM, 256); + if (memcmp(last_xpram, XPRAM, XPRAM_SIZE)) { + memcpy(last_xpram, XPRAM, XPRAM_SIZE); SaveXPRAM(); } }