3600b6

diff --git a/include/options.h b/include/options.h
index 1d76404b18ea109351bf7f17f3d90469a64fa787..43422e88230d384ef3ea52c89d71edddbe6fb128 100644 (file)
--- a/include/options.h
+++ b/include/options.h
@@ -90,6 +90,7 @@ struct jport {
        int autofire;
        struct inputdevconfig idc;
        bool nokeyboardoverride;
+       bool changed;
 };
 #define JPORT_UNPLUGGED -2
 #define JPORT_NONE -1

diff --git a/od-win32/win32.h b/od-win32/win32.h
index ce4e76a8ddb365e6dd5f10096266f8021517e27c..4d695f33862c2cae48b9d674ad22ac99503a509e 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("5")
+#define WINUAEBETA _T("6")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2017, 9, 30)
+#define WINUAEDATE MAKEBD(2017, 10, 14)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 0b5d04e2f03b86225d8287763815ec0dbd946fd0..d4b75926cda6041866436d65270d3ef508321f30 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -4,6 +4,18 @@ JIT Direct current rules are less complex now. It automatically switches off onl
   - RTG VRAM is outside of reserved natmem space. Workaround: Move RTG in earlier position using Hardware info GUI panel.\r
   Note that in 64-bit version RTG VRAM must be inside of reserved natmem space. (Outside = error message and return back to GUI)\r
 \r
+Beta 6:\r
+\r
+- "PC Bridge (40)" drive was missing from "Don't support 360k floppy images in Amiga drive unless it is configured as 5.25" drive" check.\r
+- American Laser Games work again (b3).\r
+- PCMCIA SRAM/IDE work again (b1?).\r
+- Previous button release update always released buttons when input devices were released but it should have only been done when mouse was uncaptured.\r
+- Delay avioutput init until first display frame or sound buffer recording request comes. Previously "before filtering" option may have used wrong display size in some situations.\r
+- Avioutput does not anymore forget uncompressed video selection.\r
+- First frame was not rendered (and also not recorded) if statefile was restored when emulation was already running.\r
+- If emulator state was changed (debugger breakpoint, statefile save etc..), last frame before state change was not recorded if avioutput recording was enabled.\r
+- uae-configuration joystick port (joyportx) modification only queued changes.\r
+\r
 Beta 5:\r
 \r
 - Do not fallback to standard D3D9 from D3D9Ex if -nod3dshader command line is used, removed also other now mostly useless fallbacks.\r