diff options
| author | David Turner | 2015-01-30 12:50:58 +0000 |
|---|---|---|
| committer | David Turner | 2015-01-30 12:50:58 +0000 |
| commit | 71e95fa3400c5c228fcec6e43f88dc2fbdb0e0e5 (patch) | |
| tree | b00a82a44e41eb4cf1a687b17ece518004ca1017 | |
| parent | a48a6ad30e52f52793ba9b09271146f2553a656d (diff) | |
| parent | 5eefa62899950ea9e1644a2f597fcfa6b9ad50b9 (diff) | |
| download | scummvm-rg350-71e95fa3400c5c228fcec6e43f88dc2fbdb0e0e5.tar.gz scummvm-rg350-71e95fa3400c5c228fcec6e43f88dc2fbdb0e0e5.tar.bz2 scummvm-rg350-71e95fa3400c5c228fcec6e43f88dc2fbdb0e0e5.zip | |
Merge pull request #573 from raziel-/patch-3
AMIGAOS: Re-add a DosList feature
| -rw-r--r-- | backends/fs/amigaos4/amigaos4-fs.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/backends/fs/amigaos4/amigaos4-fs.cpp b/backends/fs/amigaos4/amigaos4-fs.cpp index 7bebdf8ce6..6d5b099736 100644 --- a/backends/fs/amigaos4/amigaos4-fs.cpp +++ b/backends/fs/amigaos4/amigaos4-fs.cpp @@ -381,15 +381,17 @@ AbstractFSList AmigaOSFilesystemNode::listVolumes() const { dosList = IDOS->NextDosEntry(dosList, LDF_VOLUMES); while (dosList) { if (dosList->dol_Type == DLT_VOLUME && - dosList->dol_Name) { + dosList->dol_Name && + dosList->dol_Port) { // The original line was //if (dosList->dol_Type == DLT_VOLUME && //dosList->dol_Name && //dosList->dol_Task) { // which errored using SDK 53.24 with a 'struct dosList' has no member called 'dol_Task' - // I removed dol_Task because it's not used anywhere else - // and it neither brought up further errors nor crashes or regressions + // The reason for that was that + // 1) dol_Task wasn't a task pointer, it is a message port instead + // 2) It was redefined to be dol_Port in dos/obsolete.h in afore mentioned SDK // Copy name to buffer IDOS->CopyStringBSTRToC(dosList->dol_Name, buffer, MAXPATHLEN); |