From a895c3eed9da643f451c9b74d873e6b29a654900 Mon Sep 17 00:00:00 2001 From: Chris Young Date: Wed, 28 Jan 2015 23:41:33 +0000 Subject: Avoid giving ASL a NULL pointer for the initial drawer. Thanks to Matthey for the debugging --- amiga/file.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/amiga/file.c b/amiga/file.c index e191ae190..733c9c780 100644 --- a/amiga/file.c +++ b/amiga/file.c @@ -244,11 +244,16 @@ void ami_file_save_req(int type, struct gui_window_2 *gwin, void ami_file_req_init(void) { + const char *initial_dir = nsoption_charp(download_dir); + Tag initial_dir_tag = ASLFR_InitialDrawer; + + if(initial_dir == NULL) initial_dir_tag = TAG_IGNORE; + filereq = (struct FileRequester *)AllocAslRequest(ASL_FileRequest, NULL); savereq = (struct FileRequester *)AllocAslRequestTags(ASL_FileRequest, ASLFR_DoSaveMode, TRUE, ASLFR_RejectIcons, TRUE, - ASLFR_InitialDrawer, nsoption_charp(download_dir), + initial_dir_tag, initial_dir, TAG_DONE); aslhookfunc.h_Entry = (void *)&ami_file_asl_mime_hook; @@ -261,3 +266,4 @@ void ami_file_req_free(void) FreeAslRequest(filereq); FreeAslRequest(savereq); } + -- cgit v1.2.3