Apple-2-Tools
/
ciderpress
mirror of https://github.com/fadden/ciderpress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix overwrite dialog 

Was setting the original pathname improperly, so when attempting
to add a file to a NuFX archive the "do you want to overwrite
existing entry?" dialog contained gibberish.
This commit is contained in:
Andy McFadden 2015-01-13 15:47:18 -08:00
parent 1d6736fd92
commit 432b1c4cc6
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/NufxArchive.cpp
View File

@ -989,7 +989,7 @@ bool NufxArchive::AddDisk(ActionProgressDialog* pActionProgress,
unsigned char* diskData = NULL;
WCHAR curDir[MAX_PATH] = L"\\";
bool retVal = false;
CStringA storageNameA, origNameA;
CStringA storageNameA;
LOGI("AddDisk: '%ls' (count=%d)", (LPCWSTR) pAddOpts->GetDirectory(),
pAddOpts->GetFileNames().GetCount());
@ -1051,9 +1051,8 @@ bool NufxArchive::AddDisk(ActionProgressDialog* pActionProgress,
details.storageType = kBlockSize;
details.access = kNuAccessUnlocked;
details.extraType = pAddOpts->fpDiskImg->GetNumBlocks();
origNameA = fileName; // narrowing conversion
storageNameA = pathProp.fStoredPathName;
details.origName = origNameA;
storageNameA = pathProp.fStoredPathName; // TODO(Unicode)
details.origName = (LPCWSTR) fileName; // pass wide string through
details.storageNameMOR = storageNameA;
details.fileSysID = kNuFileSysUnknown;
details.fileSysInfo = PathProposal::kDefaultStoredFssep;
@ -1314,6 +1313,7 @@ NuResult NufxArchive::HandleReplaceExisting(const NuErrorStatus* pErrorStatus)
ConfirmOverwriteDialog confOvwr;
PathName path(pErrorStatus->pathnameUNI);
// TODO(Unicode): convert MOR to Unicode
confOvwr.fExistingFile = pErrorStatus->pRecord->filenameMOR;
confOvwr.fExistingFileModWhen =
DateTimeToSeconds(&pErrorStatus->pRecord->recModWhen);
@ -1322,7 +1322,7 @@ NuResult NufxArchive::HandleReplaceExisting(const NuErrorStatus* pErrorStatus)
PathName checkPath(confOvwr.fNewFileSource);
confOvwr.fNewFileModWhen = checkPath.GetModWhen();
} else {
confOvwr.fNewFileSource = "???";
confOvwr.fNewFileSource = L"???";
confOvwr.fNewFileModWhen = kDateNone;
}