[Scummvm-git-logs] scummvm master -> 5e470cad0930b83ce17fe85ab9f1c347ce7c7ebf

sev- noreply at scummvm.org
Fri Oct 4 20:14:57 UTC 2024


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
5e470cad09 BACKENDS: MORPHOS: Fix ASL lock on directory


Commit: 5e470cad0930b83ce17fe85ab9f1c347ce7c7ebf
    https://github.com/scummvm/scummvm/commit/5e470cad0930b83ce17fe85ab9f1c347ce7c7ebf
Author: Hubert Maier (raziel- at users.noreply.github.com)
Date: 2024-10-04T22:14:53+02:00

Commit Message:
BACKENDS: MORPHOS: Fix ASL lock on directory

Changed paths:
    backends/dialogs/morphos/morphos-dialogs.cpp


diff --git a/backends/dialogs/morphos/morphos-dialogs.cpp b/backends/dialogs/morphos/morphos-dialogs.cpp
index 9c70d5afd8f..77fb2eb2b1d 100644
--- a/backends/dialogs/morphos/morphos-dialogs.cpp
+++ b/backends/dialogs/morphos/morphos-dialogs.cpp
@@ -42,7 +42,6 @@ Common::DialogManager::DialogResult MorphosDialogManager::showFileBrowser(const
 	struct Library *AslBase = OpenLibrary(AslName, 39);
 
 	if (AslBase) {
-
 		struct FileRequester *fr = NULL;
 
 		if (ConfMan.hasKey("browser_lastpath")) {
@@ -50,12 +49,10 @@ Common::DialogManager::DialogResult MorphosDialogManager::showFileBrowser(const
 		}
 
 		fr = (struct FileRequester *)AllocAslRequestTags(ASL_FileRequest, TAG_DONE);
-
 		if (!fr)
 			return result;
 
 		if (AslRequestTags(fr, ASLFR_TitleText, (IPTR)newTitle.c_str(), ASLFR_RejectIcons, TRUE, ASLFR_InitialDrawer, (IPTR)pathBuffer, ASLFR_DrawersOnly, (isDirBrowser ? TRUE : FALSE), TAG_DONE)) {
-
 			if (strlen(fr->fr_Drawer) < sizeof(pathBuffer)) {
 				strncpy(pathBuffer, fr->fr_Drawer, sizeof(pathBuffer));
 				ConfMan.setPath("browser_lastpath", pathBuffer); // only path
@@ -65,13 +62,10 @@ Common::DialogManager::DialogResult MorphosDialogManager::showFileBrowser(const
 				choice = Common::FSNode(pathBuffer);
 				result = kDialogOk;
 			}
-			FreeAslRequest((APTR)fr);
 		}
-
+		FreeAslRequest((APTR)fr);
 		CloseLibrary(AslBase);
 	}
-
 	return result;
 }
-
 #endif




More information about the Scummvm-git-logs mailing list