From 155547f847c9215c855099cf9935cc4f63515de2 Mon Sep 17 00:00:00 2001
From: tomcw <tomcw@users.noreply.github.com>
Date: Sun, 4 Nov 2018 16:35:25 +0000
Subject: [PATCH] 1.27.10: Bump version & update History.txt

---
 bin/History.txt      | 14 ++++++++++++++
 resource/Applewin.rc |  8 ++++----
 source/Memory.cpp    |  5 +++++
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/bin/History.txt b/bin/History.txt
index 152f821a..37886844 100644
--- a/bin/History.txt
+++ b/bin/History.txt
@@ -8,6 +8,20 @@ https://github.com/AppleWin/AppleWin/issues/new
 
 Tom Charlesworth
 
+
+1.27.10.0 - 4 Nov 2018
+----------------------
+. [Change #590] Apple II original: default to 48K (so no LC installed in slot-0).
+	- Added new command line switch: -s0 <languagecard|lc>
+	('lc' is an alias for 'languagecard')
+	- When LC is in slot-0, it now use the Apple II+'s F8 (auto-start) ROM
+. [Change #408] Support Saturn 64K and 128K cards in slot-0.
+	- Added new command line switch: -s0 <saturn|saturn64|saturn128>
+	('saturn' is an alias for 'saturn128')
+. [Bug #591] Save-state wasn't preserving the 'key-waiting' flag.
+. [Bug #587] Debugger: disassembly for branch targets < $1000 were missing the leading '0'.
+
+
 1.27.9.0 - 2 Oct 2018
 ---------------------
 . [Bug #582] Support for partial disk II latch reads when accesses are very close.
diff --git a/resource/Applewin.rc b/resource/Applewin.rc
index 8d985736..3a4d3378 100644
--- a/resource/Applewin.rc
+++ b/resource/Applewin.rc
@@ -252,8 +252,8 @@ DISK_ICON               ICON                    "DISK.ICO"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,27,9,0
- PRODUCTVERSION 1,27,9,0
+ FILEVERSION 1,27,10,0
+ PRODUCTVERSION 1,27,10,0
  FILEFLAGSMASK 0x3fL
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -271,12 +271,12 @@ BEGIN
             VALUE "Comments", "https://github.com/AppleWin"
             VALUE "CompanyName", "AppleWin"
             VALUE "FileDescription", "Apple //e Emulator for Windows"
-            VALUE "FileVersion", "1, 27, 9, 0"
+            VALUE "FileVersion", "1, 27, 10, 0"
             VALUE "InternalName", "APPLEWIN"
             VALUE "LegalCopyright", " 1994-2018 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, 27, 9, 0"
+            VALUE "ProductVersion", "1, 27, 10, 0"
         END
     END
     BLOCK "VarFileInfo"
diff --git a/source/Memory.cpp b/source/Memory.cpp
index 52efdbe1..42dcc991 100644
--- a/source/Memory.cpp
+++ b/source/Memory.cpp
@@ -2021,6 +2021,11 @@ LPVOID MemGetSlotParameters(UINT uSlot)
 
 void MemSetSnapshot_v1(const DWORD MemMode, const BOOL LastWriteRam, const BYTE* const pMemMain, const BYTE* const pMemAux)
 {
+	// Create default LC type for AppleII machine (do prior to loading saved LC state)
+	ResetDefaultMachineMemTypes();
+	g_MemTypeAppleII = CT_LanguageCard;	// SSv1 doesn't save machine type - so if current machine is Apple II then give it 64K + LC
+	SetExpansionMemTypeDefault();
+
 	SetMemMode(MemMode ^ MF_INTCXROM);	// Convert from SLOTCXROM to INTCXROM
 	SetLastRamWrite(LastWriteRam);