4900b30

diff --git a/custom.cpp b/custom.cpp
index bf01216a49b4c4a2ae3fa510f5940c8fc0915a60..50e2244580b68b1aeff28c09a29a6d664cf4bc86 100644 (file)
--- a/custom.cpp
+++ b/custom.cpp
@@ -1829,7 +1829,7 @@ static bool fetch(int nr, int fm, int hpos, bool addmodulo)
 {
        int add = fetchmode_bytes;
 
-       if (cycle_line_slot[hpos] == CYCLE_REFRESH) {
+       if (cycle_line_slot[hpos] == CYCLE_REFRESH || cycle_line_slot[hpos] == CYCLE_STROBE) {
                // refresh conflict
                add = fetch_warn(nr, hpos);
        } else if (cycle_line_slot[hpos] == CYCLE_MISC) {

diff --git a/expansion.cpp b/expansion.cpp
index 6ca216586f3cced12a102a0d0be489f1da769edf..4ebb3a4c2d460eda966f99b2fcc45e22d27b6c41 100644 (file)
--- a/expansion.cpp
+++ b/expansion.cpp
@@ -3936,7 +3936,7 @@ uae_u8 *save_expansion_boards(int *len, uae_u8 *dstptr, int cardnum)
                save_u8(ec->aci.autoconfig_bytes[j]);
        }
        struct romconfig *rc = ec->rc;
-       if (rc) {
+       if (rc && rc->back) {
                save_u32(rc->back->device_type);
                save_u32(rc->back->device_num);
                save_string(rc->romfile);

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 50c57b9de1b10ca57d76b1923f037f7e322548c3..d137cba03a57f3212a5908c3c15e785bc3fb824a 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -20,12 +20,12 @@
 #define LANG_DLL_FULL_VERSION_MATCH 1
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("Beta 29")
+#define WINUAEBETA _T("Beta 30")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2021, 8, 9)
+#define WINUAEDATE MAKEBD(2021, 8, 15)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 2547c57f1805b814b99b745fb65871265c8770de..d20b9f0931caed76d7e02432127e64998279e330 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,16 @@
 
+
+- BEAMCON0 LOLDIS modification was ignored unless display setup needed reinitialization (programmed refresh rate change etc..)
+- Programmed VBLANK (BEAMCON0 bit 12) didn't blank lines after VBSTRT in some situations.
+- Fixed scanline offset if resolution and BPLCON1 was changed during same scanline.
+- Sprite horizontal wrap around support was only partially implemented.
+- Horizontal display window (DIWSTRT/DIWSTOP) didn't support some wrap around/start larger than stop conditions correctly.
+- Borderblank glitch emulation improved. If HDIW is open before first BPL1DAT access, there is 1.5 lores pixel COLOR00 gap between borderblank and first bitplane pixel.
+- Reset didn't clear CIA-A/B B data port/direction.
+- Bitplane first refresh slot conflict (strobe signal) was not reported and didn't trigger simulated conflict corrupted graphics.
+- Added A590/A2091 v4.4 ROMs to ROM scanner. Probably original release version because ROMs had labels 390388-01 and 390389-01.
+- If on the fly (emulation has already been started) Quickstart model or model specific change modifies expansion devices, force internal "Restart"-button press. Without it not all expansion devices initialize correctly.
+
 Beta 29:
 
 - b28 copper update was wrong. Second attempt. (Hotbleeps etc. This time without breaking others.)