Merge pull request AppleWin#279 from AppleWin/1.25.0.4

Fix for Applewin exiting when using -d1 arg (AppleWin#276) and set version to 1.25.0.4
tommcdon · Apr 23, 2015 · 60db3d6 · 60db3d6
2 parents 565fd79 + 9191efe
commit 60db3d6
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 5 deletions.
diff --git a/bin/History.txt b/bin/History.txt
@@ -9,6 +9,12 @@ https://github.com/AppleWin/AppleWin/issues/new
 Tom Charlesworth
 
 
+1.25.0.4 - 23 Apr 2015
+----------------------
+Fixes:
+. [Bug #276] -d1 command line argument caused AppleWin to quickly exit. 
+
+
 1.25.0.3 - 8 Sep 2014
 ---------------------
 Note: This is the last planned version to support Win98/ME.

diff --git a/resource/Applewin.rc b/resource/Applewin.rc
@@ -250,8 +250,8 @@ DISK_ICON               ICON                    "DISK.ICO"
 //
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,25,0,3
- PRODUCTVERSION 1,25,0,3
+ FILEVERSION 1,25,0,4
+ PRODUCTVERSION 1,25,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, 25, 0, 3"
+            VALUE "FileVersion", "1, 25, 0, 4"
             VALUE "InternalName", "APPLEWIN"
-            VALUE "LegalCopyright", " 1994-2014 Michael O'Brien, Oliver Schmidt, Tom Charlesworth, Michael Pohoreski, Nick Westgate, Linards Ticmanis"
+            VALUE "LegalCopyright", " 1994-2015 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, 25, 0, 3"
+            VALUE "ProductVersion", "1, 25, 0, 4"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/source/Frame.cpp b/source/Frame.cpp
@@ -617,6 +617,9 @@ void FrameDrawDiskLEDS( HDC passdc )
 //===========================================================================
 void FrameDrawDiskStatus( HDC passdc )
 {
+	if (mem == NULL)
+		return;
+
 	// We use the actual drive since probing from memory doesn't tell us anything we don't already know.
 	//        DOS3.3   ProDOS
 	// Drive  $B7EA    $BE3D