Apple-2-Tools/ciderpress
1
0
Fork 0
mirror of https://github.com/fadden/ciderpress.git synced 2024-12-22 20:29:51 +00:00
Code Issues Projects Releases Wiki Activity

Handle cancellation

Browse Source 
Don't show an error if the user has "confirm disk image format"
selected and cancels out of the dialog.
This commit is contained in:
Andy McFadden 2015-01-13 16:48:08 -08:00
parent 814872966e
commit a2962e976f
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/Main.cpp
View File

@ -1944,10 +1944,14 @@ int MainWindow::LoadArchive(const WCHAR* fileName, const WCHAR* extension,
* Try to open the file according to the specified filter index. If * Try to open the file according to the specified filter index. If
* it works, we're done. Trying this first ensures that you can choose * it works, we're done. Trying this first ensures that you can choose
* to open, say, a .SDK file as either ShrinkIt or Disk Image. * to open, say, a .SDK file as either ShrinkIt or Disk Image.
*
* It's possible to cancel the file open if you have "confirm disk image
* format set" and the file is a disk image. In that case we want to
* return with an error result, but without showing an error dialog.
*/ */
CString firstErrStr; CString firstErrStr;
pOpenArchive = CreateArchiveInstance(filterIndex); pOpenArchive = CreateArchiveInstance(filterIndex);
LOGD(" First try: %ls", (LPCWSTR) pOpenArchive->GetDescription()); LOGD("First try: %ls", (LPCWSTR) pOpenArchive->GetDescription());
openResult = pOpenArchive->Open(fileName, readOnly, &firstErrStr); openResult = pOpenArchive->Open(fileName, readOnly, &firstErrStr);
if (openResult == GenericArchive::kResultSuccess) { if (openResult == GenericArchive::kResultSuccess) {
// success! // success!
@ -1960,6 +1964,10 @@ int MainWindow::LoadArchive(const WCHAR* fileName, const WCHAR* extension,
} else { } else {
firstErrStr = L"This appears to be a file archive."; firstErrStr = L"This appears to be a file archive.";
} }
} else if (openResult == GenericArchive::kResultCancel) {
LOGD("canceled");
delete pOpenArchive;
return -1;
} }
delete pOpenArchive; delete pOpenArchive;
@ -1977,6 +1985,10 @@ int MainWindow::LoadArchive(const WCHAR* fileName, const WCHAR* extension,
// success! // success!
SwitchContentList(pOpenArchive); SwitchContentList(pOpenArchive);
return 0; return 0;
} else if (openResult == GenericArchive::kResultCancel) {
LOGD("cancelled");
delete pOpenArchive;
return -1;
} }
delete pOpenArchive; delete pOpenArchive;
} }
@ -1993,6 +2005,7 @@ int MainWindow::LoadArchive(const WCHAR* fileName, const WCHAR* extension,
* trying to open disk images anyway. * trying to open disk images anyway.
*/ */
if (firstErrStr.IsEmpty()) { if (firstErrStr.IsEmpty()) {
// not expected; put up a generic message if it happens
firstErrStr = L"Unable to determine what kind of file this is."; firstErrStr = L"Unable to determine what kind of file this is.";
} }
ShowFailureMsg(this, firstErrStr, IDS_FAILED); ShowFailureMsg(this, firstErrStr, IDS_FAILED);