Apple-2-Tools/AppleWin
1
0
Fork 0
mirror of https://github.com/AppleWin/AppleWin.git synced 2024-12-23 00:30:17 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #279 from AppleWin/1.25.0.4

Browse Source 
Fix for Applewin exiting when using -d1 arg (#276) and set version to 1.25.0.4
This commit is contained in:
TomCh 2015-04-23 21:48:35 +01:00
commit 60db3d6622
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bin/History.txt
View File

@ -9,6 +9,12 @@ https://github.com/AppleWin/AppleWin/issues/new
Tom Charlesworth 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 1.25.0.3 - 8 Sep 2014
--------------------- ---------------------
Note: This is the last planned version to support Win98/ME. Note: This is the last planned version to support Win98/ME.

10
resource/Applewin.rc
View File

@ -250,8 +250,8 @@ DISK_ICON ICON "DISK.ICO"
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,25,0,3 FILEVERSION 1,25,0,4
PRODUCTVERSION 1,25,0,3 PRODUCTVERSION 1,25,0,4
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -269,12 +269,12 @@ BEGIN
VALUE "Comments", "https://github.com/AppleWin" VALUE "Comments", "https://github.com/AppleWin"
VALUE "CompanyName", "AppleWin" VALUE "CompanyName", "AppleWin"
VALUE "FileDescription", "Apple //e Emulator for Windows" VALUE "FileDescription", "Apple //e Emulator for Windows"
VALUE "FileVersion", "1, 25, 0, 3" VALUE "FileVersion", "1, 25, 0, 4"
VALUE "InternalName", "APPLEWIN" 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 "OriginalFilename", "APPLEWIN.EXE"
VALUE "ProductName", "Apple //e Emulator" VALUE "ProductName", "Apple //e Emulator"
VALUE "ProductVersion", "1, 25, 0, 3" VALUE "ProductVersion", "1, 25, 0, 4"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"

3
source/Frame.cpp
View File

@ -617,6 +617,9 @@ void FrameDrawDiskLEDS( HDC passdc )
//=========================================================================== //===========================================================================
void FrameDrawDiskStatus( 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. // We use the actual drive since probing from memory doesn't tell us anything we don't already know.
// DOS3.3 ProDOS // DOS3.3 ProDOS
// Drive $B7EA $BE3D // Drive $B7EA $BE3D