X-Git-Url: https://notaz.gp2x.de/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=Pico%2FVideoPort.c;h=cceab7c7cb6e6a79e92ddad5b2d13b320a7aba4d;hb=fad248933b6676d30ccf419858b4ee10cc123fc5;hp=59a57b2a70c30200660aadb29bb4ed9d5f0847e6;hpb=0ffefdb8bd172c258497ce0cd14d1f2ea1358f69;p=picodrive.git

diff --git a/Pico/VideoPort.c b/Pico/VideoPort.c
index 59a57b2..cceab7c 100644
--- a/Pico/VideoPort.c
+++ b/Pico/VideoPort.c
@@ -134,11 +134,12 @@ static void DmaSlow(int len)
       return;
     }
   } else {
-    if (source<Pico.romsize) { // Rom
+    // if we have DmaHook, let it handle ROM because of possible DMA delay
+    if (PicoDmaHook && PicoDmaHook(source, len, &pd, &pdend));
+    else if (source<Pico.romsize) { // Rom
       pd=(u16 *)(Pico.rom+(source&~1));
       pdend=(u16 *)(Pico.rom+Pico.romsize);
     }
-    else if (PicoDmaHook && PicoDmaHook(source, len, &pd, &pdend));
     else {
       elprintf(EL_VDPDMA|EL_ANOMALY, "DmaSlow[%i] %06x->%04x: invalid src", Pico.video.type, source, a);
       return;
@@ -398,7 +399,7 @@ PICO_INTERNAL_ASM void PicoVideoWrite(unsigned int a,unsigned short d)
             else if(pints & 0x10) irq = 4;
             SekInterrupt(irq); // update line
 
-            if (irq) SekEndRun(24); // make it delayed
+            if (irq && Pico.m.scanline!=-1) SekEndRun(24); // make it delayed
           }
         }
 #endif