X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FArea.c;h=68d7c7c63678e9fe1bfb9e68622de1b76481df39;hb=145650410c2a6a4b0277067e8237537bb57063af;hp=41ee68ba424a2ddb190c7b2ad7cb0a9351260eb2;hpb=3aa1e148a28da9b4e10e824984f7b3a4908b1ace;p=picodrive.git

diff --git a/Pico/Area.c b/Pico/Area.c
index 41ee68b..68d7c7c 100644
--- a/Pico/Area.c
+++ b/Pico/Area.c
@@ -71,7 +71,7 @@ PICO_INTERNAL int PicoAreaPackCpu(unsigned char *cpu, int is_sub)
   *(unsigned int  *)(cpu+0x44)=context->sr;
   *(unsigned int  *)(cpu+0x48)=context->asp;
   cpu[0x4c] = context->interrupts[0];
-  cpu[0x4d] = (context->execinfo & M68K_HALTED) ? 1 : 0;
+  cpu[0x4d] = (context->execinfo & FM68K_HALTED) ? 1 : 0;
 #endif
 
   *(unsigned int *)(cpu+0x40)=pc;
@@ -108,8 +108,8 @@ PICO_INTERNAL int PicoAreaUnpackCpu(unsigned char *cpu, int is_sub)
   context->sr =*(unsigned int *)(cpu+0x44);
   context->asp=*(unsigned int *)(cpu+0x48);
   context->interrupts[0] = cpu[0x4c];
-  context->execinfo &= ~M68K_HALTED;
-  if (cpu[0x4d]&1) context->execinfo |= M68K_HALTED;
+  context->execinfo &= ~FM68K_HALTED;
+  if (cpu[0x4d]&1) context->execinfo |= FM68K_HALTED;
 #endif
   return 0;
 }
@@ -174,7 +174,7 @@ int PmovState(int PmovAction, void *PmovFile)
   int minimum=0;
   unsigned char head[32];
 
-  if (PicoMCD & 1)
+  if ((PicoMCD & 1) || carthw_chunks != NULL)
   {
     if (PmovAction&1) return PicoCdSaveState(PmovFile);
     if (PmovAction&2) return PicoCdLoadState(PmovFile);