4010b4

diff --git a/od-win32/dinput.cpp b/od-win32/dinput.cpp
index 03e20a67f4806f9ab1fdd2829cc3d7aa354fab54..1bf93abe3d121b1f89a308d890ef44e970c21287 100644 (file)
--- a/od-win32/dinput.cpp
+++ b/od-win32/dinput.cpp
@@ -2152,18 +2152,17 @@ static void handle_rawinput_2 (RAWINPUT *raw, LPARAM lParam)
                OutputDebugString(xx);
 #endif
 
-
-               if (num == num_mouse)
-                       return;
-
                USHORT usButtonFlags = rm->usButtonFlags;
 
 #ifdef RETROPLATFORM
-               if (isfocus() > 0 && usButtonFlags) {
+               if (usButtonFlags) {
                        usButtonFlags = rp_rawbuttons(lParam, usButtonFlags);
                }
 #endif
 
+               if (num == num_mouse)
+                       return;
+
                if (isfocus () > 0 || istest) {
                        static int lastx[MAX_INPUT_DEVICES], lasty[MAX_INPUT_DEVICES];
                        static int lastmbr[MAX_INPUT_DEVICES];

diff --git a/od-win32/win32.h b/od-win32/win32.h
index aa9a966b5afb4cf36da11e5a70fa7e254068e838..e3d0ab6fe9142afcbcbfadfb680f66b034067355 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("3")
+#define WINUAEBETA _T("4")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2018, 7, 8)
+#define WINUAEDATE MAKEBD(2018, 7, 10)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index a4bb13745bbc56cd13d01fc7674c7fadc404161a..2c57e14ad348dfec0e4099b332bb631d20d9aa1f 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,5 +1,12 @@
 \r
 \r
+Beta 4:\r
+\r
+- Floppy, CD, Tape, HDF geometry, HDF filesystem, disk swapper, RTC and flash rom file paths also support b1 resolve environmental variables update. (b1 update had issues requiring partial rewrite so it was good idea to update all other paths too. Excluding special paths like ROM paths.)\r
+- Previously only some SCSI controllers flashed CD led when emulating CD drive.\r
+\r
+Short description about path handling change: Previously any path was always converted to either full absolute or relative path with possible environmental variables resolved when config was loaded or path was typed/selected from dialog. When config was saved, old path (possibly containing environmental variables) was lost. Now paths are loaded unmodified from config file and only converted when needed. "Normal" path strings (no environmental variables) are still automatically converted to absolute/relative when saving config.\r
+\r
 Beta 3:\r
 \r
 - If CD audio playing from real/virtual CD (not directly mounted image) was restarted because of config change, playback always started from beginning (or possibly failed to restart).\r