diff --git a/DIST/with-mdc.deploy b/DIST/with-mdc.deploy index e0a739d..c0f32d5 100644 --- a/DIST/with-mdc.deploy +++ b/DIST/with-mdc.deploy @@ -4,8 +4,8 @@ faddenSoft http://www.faddensoft.com/ CiderPress http://a2ciderpress.com/ -4.0.1 -42240 +4.0.2-a1 +42364 C:\DATA\faddenSoft\fs.ico Copyright © 2015 CiderPress project authors. All rights reserved. C:\Src\CiderPress\DIST\ReadMe.txt @@ -355,7 +355,7 @@ FALSE 4095 -Setup401.exe +Setup402a1.exe FALSE diff --git a/app/MyApp.h b/app/MyApp.h index abcaad4..834bec9 100644 --- a/app/MyApp.h +++ b/app/MyApp.h @@ -14,8 +14,8 @@ /* CiderPress version numbers */ #define kAppMajorVersion 4 #define kAppMinorVersion 0 -#define kAppBugVersion 1 -#define kAppDevString L"" +#define kAppBugVersion 2 +#define kAppDevString L"a1" /* * Windows application object. diff --git a/reformat/ResourceFork.cpp b/reformat/ResourceFork.cpp index 614eda4..72eabc7 100644 --- a/reformat/ResourceFork.cpp +++ b/reformat/ResourceFork.cpp @@ -79,6 +79,10 @@ int ReformatResourceFork::Process(const ReformatHolder* pHolder, result = ReadHeader(srcBuf, srcLen, &rFileVersion, &rFileToMap, &rFileMapSize, &littleEndian); + if (!result) { + BufPrintf("Does not appear to be a valid resource fork.\r\n"); + goto done; + } BufPrintf("Resource fork header (%s):\r\n", littleEndian ? "Apple IIgs little-endian" : "Macintosh big-endian"); @@ -93,10 +97,6 @@ int ReformatResourceFork::Process(const ReformatHolder* pHolder, BufPrintf("Not an Apple IIgs resource fork (probably Macintosh).\r\n"); goto done; } - if (!result) { - BufPrintf("Does not appear to be a valid resource fork.\r\n"); - goto done; - } /* move to start of resource map */ const uint8_t* mapPtr; @@ -169,7 +169,7 @@ done: bool* pLittleEndian) { if (srcLen < 128) { - LOGI("ReformatResource: invalid len %d", srcLen); + LOGD("ReformatResource: invalid len %d", srcLen); return false; }