aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHubert Maier2015-01-26 19:56:24 +0200
committerHubert Maier2015-01-26 19:56:24 +0200
commit5eefa62899950ea9e1644a2f597fcfa6b9ad50b9 (patch)
tree45aed2b771d794dafd8d8daefbabd08c1d92a765
parent8f551202f6c0029773524fe4686c1147f51b4ee6 (diff)
downloadscummvm-rg350-5eefa62899950ea9e1644a2f597fcfa6b9ad50b9.tar.gz
scummvm-rg350-5eefa62899950ea9e1644a2f597fcfa6b9ad50b9.tar.bz2
scummvm-rg350-5eefa62899950ea9e1644a2f597fcfa6b9ad50b9.zip
AMIGAOS: Re-add a DosList feature
To keep consistency with the original code i re-added the DosList feature dol_Port (which was taken out due to a compiler error using SDK 53.24 and was named wrong anyway). It offers a message port for the DosList.
-rw-r--r--backends/fs/amigaos4/amigaos4-fs.cpp8
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);