3600b19

diff --git a/od-win32/direct3d11.cpp b/od-win32/direct3d11.cpp
index cbc00ef925b64316accdd0ad29b78425c884ab81..dd9ede4c85e4fe5b5005ef3d4422abef6de75ed2 100644 (file)
--- a/od-win32/direct3d11.cpp
+++ b/od-win32/direct3d11.cpp
@@ -4111,6 +4111,21 @@ static void xD3D11_clear(void)
        d3d->m_deviceContext->ClearRenderTargetView(d3d->m_renderTargetView, color);
 }
 
+
+static bool xD3D11_quit(struct d3d11struct *d3d)
+{
+       if (quit_program != -UAE_QUIT)
+               return false;
+       if (d3d->m_swapChain && !d3d->invalidmode) {
+               d3d->m_swapChain->SetFullscreenState(FALSE, NULL);
+               FreeTextures(d3d);
+               d3d->fsmode = 0;
+               d3d->invalidmode = true;
+               d3d->fsmodechange = 0;
+       }
+       return true;
+}
+
 static void xD3D11_refresh(void)
 {
        struct d3d11struct *d3d = &d3d11data[0];
@@ -4126,6 +4141,8 @@ static void xD3D11_refresh(void)
 
 static void recheck(struct d3d11struct *d3d)
 {
+       if (xD3D11_quit(d3d))
+               return;
        if (d3d->resizeretry) {
                resizemode(d3d);
                return;
@@ -4294,12 +4311,8 @@ static void xD3D11_resize(int activate)
                return;
        }
 
-       if (d3d->m_swapChain && quit_program == -UAE_QUIT) {
-               d3d->m_swapChain->SetFullscreenState(FALSE, NULL);
-               FreeTextures(d3d);
-               d3d->fsmode = 0;
-               d3d->invalidmode = true;
-               d3d->fsmodechange = 0;
+       if (quit_program == -UAE_QUIT) {
+               xD3D11_quit(d3d);
                return;
        }
 

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 622b917fce21181caf4ee0c570797caad07626db..7b5743e963cf2a55dbbcd58ec3e5520aaf12a5d6 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 1
+#define WINUAEPUBLICBETA 0
 #define LANG_DLL 1
 #define LANG_DLL_FULL_VERSION_MATCH 1
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("18")
+#define WINUAEBETA _T("")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2018, 1, 12)
+#define WINUAEDATE MAKEBD(2018, 1, 15)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/win32gui.cpp b/od-win32/win32gui.cpp
index 178681a9fc55acf79d59f39e313367f49fe789e8..ce0d40a9525fe956c7870c2ebb688e1402494b19 100644 (file)
--- a/od-win32/win32gui.cpp
+++ b/od-win32/win32gui.cpp
@@ -2297,7 +2297,8 @@ static void prefs_to_gui (struct uae_prefs *p)
        workprefs.mountitems = currprefs.mountitems;
        memcpy (&workprefs.mountconfig, &currprefs.mountconfig, MOUNT_CONFIG_SIZE * sizeof (struct uaedev_config_info));
        updatewinfsmode (&workprefs);
-       savestate_state = st;
+       if (workprefs.statefile[0])
+               savestate_state = st;
 }
 
 static void gui_to_prefs (void)
@@ -4665,7 +4666,7 @@ void InitializeListView (HWND hDlg)
 
        } else if (lv_type == LV_MISC1) {
 
-               int itemids[] = { IDS_MISCLISTITEMS1, IDS_MISCLISTITEMS2, IDS_MISCLISTITEMS3, -1 };
+               int itemids[] = { IDS_MISCLISTITEMS1, IDS_MISCLISTITEMS2, IDS_MISCLISTITEMS3, IDS_MISCLISTITEMS4 , -1 };
                int itemoffset = 0;
                int itemcnt = 0;
                listview_column_width[0] = 150;

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 2c054a3fcb23aee46cf1d50b2c70f5d4c4daa187..dd51a4399113448cd165f99a92a4796f16e6d6e4 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -4,6 +4,12 @@ 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 19:\r
+\r
+- D3D11 fullscreen and GUI open: Quit/Restart did unnecessary fullscreen open and close. (Was working in some betas, broke later)\r
+- Loading new config file via GUI using "Load" button when emulation is already running and loaded config had statefile selected: statefile was not loaded automatically when emulation was started.\r
+\r
+Beta 18:\r
 \r
 - Added real CHS-only IDE drive HDF imaging support that works with some (single? all?) USB adapters that don't natively support CHS only drives (Drive appears as having zero byte capacity in Windows Disk Manager and SCSI READ CAPACITY returns FFFFFFFF00000200) Imager first asks for drive's CHS geometry and then uses standard Direct SCSI mode READ (10) to read correct blocks. This works as long as adapter blindly copies SCSI LBA fields to ATA CHS/LBA registers internally.\r
 - Default D3D11 fullscreen refresh rate may have incorrectly chosen native interlaced mode if it was available.\r