diff --git a/bin/History.txt b/bin/History.txt index e1f0aa0d..0be93ef4 100644 --- a/bin/History.txt +++ b/bin/History.txt @@ -9,10 +9,10 @@ https://github.com/AppleWin/AppleWin/issues/new Tom Charlesworth -1.26.0.3 (beta) - 19 Sept 2016 +1.26.0.4 (beta) - 20 Sept 2016 ------------------------------ Changes: -. [Bug #126,#157,#194] Beta NTSC support +. [Bug #126,#157,#194] Beta NTSC and cycle-accurate video support TV Color, TV B&W, Monitor Color, Monitor B&W . Full-screen native resolution (no longer 640x480 resolution) . [Bug #260] Save-state file v2: human readable (Yaml-based format) diff --git a/resource/Applewin.rc b/resource/Applewin.rc index 8d75671c..86f30b71 100644 --- a/resource/Applewin.rc +++ b/resource/Applewin.rc @@ -250,8 +250,8 @@ DISK_ICON ICON "DISK.ICO" // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,26,0,3 - PRODUCTVERSION 1,26,0,3 + FILEVERSION 1,26,0,4 + PRODUCTVERSION 1,26,0,4 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -269,12 +269,12 @@ BEGIN VALUE "Comments", "https://github.com/AppleWin" VALUE "CompanyName", "AppleWin" VALUE "FileDescription", "Apple //e Emulator for Windows" - VALUE "FileVersion", "1, 26, 0, 3" + VALUE "FileVersion", "1, 26, 0, 4" VALUE "InternalName", "APPLEWIN" VALUE "LegalCopyright", " 1994-2016 Michael O'Brien, Oliver Schmidt, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis" VALUE "OriginalFilename", "APPLEWIN.EXE" VALUE "ProductName", "Apple //e Emulator" - VALUE "ProductVersion", "1, 26, 0, 3" + VALUE "ProductVersion", "1, 26, 0, 4" END END BLOCK "VarFileInfo" diff --git a/source/Configuration/PageConfig.cpp b/source/Configuration/PageConfig.cpp index f525fc8c..44be7a0e 100644 --- a/source/Configuration/PageConfig.cpp +++ b/source/Configuration/PageConfig.cpp @@ -119,9 +119,11 @@ BOOL CPageConfig::DlgProcInternal(HWND hWnd, UINT message, WPARAM wparam, LPARAM case IDC_CHECK_CONFIRM_REBOOT: g_bConfirmReboot = IsDlgButtonChecked(hWnd, IDC_CHECK_CONFIRM_REBOOT) ? 1 : 0; + break; case IDC_CHECK_HALF_SCAN_LINES: - g_uHalfScanLines = IsDlgButtonChecked(hWnd, IDC_CHECK_HALF_SCAN_LINES) ? 1 : 0; + // Checked in DlgOK() + break; case IDC_COMPUTER: if(HIWORD(wparam) == CBN_SELCHANGE) @@ -231,10 +233,26 @@ BOOL CPageConfig::DlgProcInternal(HWND hWnd, UINT message, WPARAM wparam, LPARAM void CPageConfig::DlgOK(HWND hWnd) { + bool bVideoReinit = false; + const DWORD newvidtype = (DWORD) SendDlgItemMessage(hWnd, IDC_VIDEOTYPE, CB_GETCURSEL, 0, 0); if (g_eVideoType != newvidtype) { g_eVideoType = newvidtype; + bVideoReinit = true; + } + + const DWORD newHalfScanLines = IsDlgButtonChecked(hWnd, IDC_CHECK_HALF_SCAN_LINES) ? 1 : 0; + if (g_uHalfScanLines != newHalfScanLines) + { + g_uHalfScanLines = newHalfScanLines; + bVideoReinit = true; + } + + if (bVideoReinit) + { + FrameRefreshStatus(DRAW_TITLE, false); + VideoReinitialize(); if ((g_nAppMode != MODE_LOGO) && (g_nAppMode != MODE_DEBUG)) { diff --git a/source/DiskImage.cpp b/source/DiskImage.cpp index 4b392a3b..1842069c 100644 --- a/source/DiskImage.cpp +++ b/source/DiskImage.cpp @@ -59,8 +59,9 @@ ImageError_e ImageOpen( LPCTSTR pszImageFilename, ImageInfo* pImageInfo = (ImageInfo*) *hDiskImage; pImageInfo->bWriteProtected = *pWriteProtected; - ImageError_e Err = (!bIsHarddisk) ? sg_DiskImageHelper.Open(pszImageFilename, pImageInfo, bCreateIfNecessary, strFilenameInZip) - : sg_HardDiskImageHelper.Open(pszImageFilename, pImageInfo, bCreateIfNecessary, strFilenameInZip); + ImageError_e Err = (!bIsHarddisk) + ? sg_DiskImageHelper.Open(pszImageFilename, pImageInfo, bCreateIfNecessary, strFilenameInZip) + : sg_HardDiskImageHelper.Open(pszImageFilename, pImageInfo, bCreateIfNecessary, strFilenameInZip); if (Err != eIMAGE_ERROR_NONE) {