4100b1

diff --git a/consolehook.cpp b/consolehook.cpp
index 870e2b3e3da3ee42b693b9eaf823fcbbedfe1fb2..4fbae8d43395e1f0ac5c28cdc33c204aa40350b3 100644 (file)
--- a/consolehook.cpp
+++ b/consolehook.cpp
@@ -66,7 +66,6 @@ static void *console_thread (void *v)
                TCHAR wc = console_getch ();
                char c[2];
 
-               write_log (_T("*"));
                c[0] = 0;
                c[1] = 0;
                ua_copy (c, 1, &wc);

diff --git a/debug.cpp b/debug.cpp
index f2e4af41cadc11ea4a52bbb00628b1895a190a8f..519511613d5ea86e39aefada3a83dc7ca9355798 100644 (file)
--- a/debug.cpp
+++ b/debug.cpp
@@ -118,8 +118,10 @@ void activate_debugger (void)
 
        debug_pc = 0xffffffff;
        trace_mode = 0;
-       if (debugger_active)
+       if (debugger_active) {
+               write_log(_T("Debugger already active!?\n"));
                return;
+       }
        debug_cycles();
        debugger_active = 1;
        set_special (SPCFLAG_BRK);

diff --git a/include/options.h b/include/options.h
index 60d51635375779017eea351be7bb1cdfb7104502..ae32ed0dc50f88b8b3720aa684806390db01b7b8 100644 (file)
--- a/include/options.h
+++ b/include/options.h
@@ -15,8 +15,8 @@
 #include "traps.h"
 
 #define UAEMAJOR 4
-#define UAEMINOR 0
-#define UAESUBREV 1
+#define UAEMINOR 1
+#define UAESUBREV 0
 
 #define MAX_AMIGADISPLAYS 4
 

diff --git a/od-win32/resources/winuae.rc b/od-win32/resources/winuae.rc
index f0abd944125e0e2471d8bfdb6d7ff2eb8dedd99b..15b00f840ffe79ecb9c658a28c173fd98cf68961 100644 (file)
--- a/od-win32/resources/winuae.rc
+++ b/od-win32/resources/winuae.rc
@@ -615,7 +615,6 @@ BEGIN
     CONTROL         "Resizeable GUI",IDC_GUI_RESIZE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,211,114,11
     CONTROL         "Fullscreen GUI",IDC_GUI_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,273,224,114,11
     GROUPBOX        "State Files",IDC_STATIC,1,242,393,38
-    EDITTEXT        IDC_STATENAME,8,257,231,13,ES_AUTOHSCROLL | ES_READONLY | NOT WS_TABSTOP
     CONTROL         "",IDC_STATECLEAR,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,244,261,9,10
     PUSHBUTTON      "Load state...",IDC_DOLOADSTATE,257,257,65,14
     PUSHBUTTON      "Save state...",IDC_DOSAVESTATE,325,257,65,14
@@ -624,6 +623,7 @@ BEGIN
     COMBOBOX        IDC_KBLED2,97,295,64,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     COMBOBOX        IDC_KBLED3,184,295,64,65,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
     CONTROL         "USB mode",IDC_KBLED_USB,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,264,296,64,11
+    COMBOBOX        IDC_STATENAME,5,258,232,75,CBS_DROPDOWN | CBS_AUTOHSCROLL | WS_VSCROLL | WS_TABSTOP
 END
 
 IDD_HARDFILE DIALOGEX 0, 0, 397, 290
@@ -1376,8 +1376,8 @@ END
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 4,0,1,0
- PRODUCTVERSION 4,0,1,0
+ FILEVERSION 4,1,0,0
+ PRODUCTVERSION 4,1,0,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -1393,12 +1393,12 @@ BEGIN
         BLOCK "040904b0"
         BEGIN
             VALUE "FileDescription", "WinUAE"
-            VALUE "FileVersion", "4.0.1.0"
+            VALUE "FileVersion", "4.1.0.0"
             VALUE "InternalName", "WinUAE"
             VALUE "LegalCopyright", "© 1996-2018 under the GNU Public License (GPL)"
             VALUE "OriginalFilename", "WinUAE.exe"
             VALUE "ProductName", "WinUAE"
-            VALUE "ProductVersion", "4.0.1.0"
+            VALUE "ProductVersion", "4.1.0.0"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/od-win32/win32.h b/od-win32/win32.h
index ed193b36834cc6734e5d200f1bb3d60586561710..f9b1c09dddd93394db10af3fa9d28b1871deee3e 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -15,17 +15,17 @@
 #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100)
 #define GETBDD(x) ((x) % 100)
 
-#define WINUAEPUBLICBETA 0
+#define WINUAEPUBLICBETA 1
 #define LANG_DLL 1
-#define LANG_DLL_FULL_VERSION_MATCH 0
+#define LANG_DLL_FULL_VERSION_MATCH 1
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("6")
+#define WINUAEBETA _T("1")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2018, 7, 16)
+#define WINUAEDATE MAKEBD(2018, 8, 19)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/win32_scaler.cpp b/od-win32/win32_scaler.cpp
index 85cbb72ec9859e651f54cdb83f0ca63735b56bcc..bd7a69db74e49385e3eb9dd139658ee259832fd4 100644 (file)
--- a/od-win32/win32_scaler.cpp
+++ b/od-win32/win32_scaler.cpp
@@ -965,8 +965,6 @@ bool S2X_init(int monid, int dw, int dh, int dd)
 
 void S2X_render(int monid, int y_start, int y_end)
 {
-       if (monid)
-               return;
        struct AmigaMonitor *mon = &AMonitors[monid];
        struct amigadisplay *ad = &adisplays[monid];
        struct uae_filter *usedfilter = mon->usedfilter;