diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2013-05-25 13:59:42 +0100 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2013-05-25 13:59:42 +0100 |
| commit | b66775dc53f4117868e66d829d7fc37572865235 (patch) | |
| tree | 563ac9a95541217f8a5f5eb4ff3caccc32c61dcc /amiga | |
| parent | 9751a107057cfe19e16e778e945d76b456d3b434 (diff) | |
| download | netsurf-b66775dc53f4117868e66d829d7fc37572865235.tar.gz netsurf-b66775dc53f4117868e66d829d7fc37572865235.tar.bz2 | |
Prevent ASL from causing delayed menus
Diffstat (limited to 'amiga')
| -rw-r--r-- | amiga/context_menu.c | 2 | ||||
| -rw-r--r-- | amiga/download.c | 4 | ||||
| -rw-r--r-- | amiga/file.c | 6 | ||||
| -rw-r--r-- | amiga/menu.c | 2 | ||||
| -rw-r--r-- | amiga/tree.c | 2 |
5 files changed, 15 insertions, 1 deletions
diff --git a/amiga/context_menu.c b/amiga/context_menu.c index c6c9be899..db751da08 100644 --- a/amiga/context_menu.c +++ b/amiga/context_menu.c @@ -728,6 +728,8 @@ static uint32 ami_context_menu_hook(struct Hook *hook,Object *item,APTR reserved { case CMID_SELECTFILE: if(AslRequestTags(filereq, + ASLFR_Window, gwin->win, + ASLFR_SleepWindow, TRUE, ASLFR_TitleText,messages_get("NetSurf"), ASLFR_Screen,scrn, ASLFR_DoSaveMode,FALSE, diff --git a/amiga/download.c b/amiga/download.c index e461c5f36..f0a7d0939 100644 --- a/amiga/download.c +++ b/amiga/download.c @@ -105,6 +105,8 @@ struct gui_download_window *gui_download_window_create(download_context *ctx, else { if(AslRequestTags(savereq, + ASLFR_Window, gui->shared->win, + ASLFR_SleepWindow, TRUE, ASLFR_TitleText,messages_get("NetSurf"), ASLFR_Screen,scrn, ASLFR_InitialFile, download_context_get_filename(ctx), @@ -351,6 +353,8 @@ gui_window_save_link(struct gui_window *g, const char *url, const char *title) linkname = ASPrintf("Link_to_%s",FilePart(url)); if(AslRequestTags(savereq, + ASLFR_Window, g->shared->win, + ASLFR_SleepWindow, TRUE, ASLFR_TitleText,messages_get("NetSurf"), ASLFR_Screen,scrn, ASLFR_InitialFile,linkname, diff --git a/amiga/file.c b/amiga/file.c index 49c0afebf..74c7225d4 100644 --- a/amiga/file.c +++ b/amiga/file.c @@ -83,6 +83,8 @@ void ami_file_open(struct gui_window_2 *gwin) if(AslRequestTags(filereq, ASLFR_TitleText, messages_get("NetSurf"), + ASLFR_Window, gwin->win, + ASLFR_SleepWindow, TRUE, ASLFR_Screen, scrn, ASLFR_DoSaveMode, FALSE, ASLFR_RejectIcons, TRUE, @@ -213,7 +215,7 @@ void ami_file_save(int type, char *fname, struct Window *win, FWrite(fh, source_data, 1, strlen(source_data)); FClose(fh); } - free(source_data); + free((void *)source_data); } break; } @@ -229,6 +231,8 @@ void ami_file_save_req(int type, struct gui_window_2 *gwin, char *fname = AllocVec(1024, MEMF_CLEAR | MEMF_PRIVATE); if(AslRequestTags(savereq, + ASLFR_Window, gwin->win, + ASLFR_SleepWindow, TRUE, ASLFR_TitleText, messages_get("NetSurf"), ASLFR_Screen, scrn, ASLFR_InitialFile, object ? FilePart(nsurl_access(hlcache_handle_get_url(object))) : "", diff --git a/amiga/menu.c b/amiga/menu.c index 105b70166..2c8f541bb 100644 --- a/amiga/menu.c +++ b/amiga/menu.c @@ -963,6 +963,8 @@ static void ami_menu_item_arexx_execute(struct Hook *hook, APTR window, struct I GetAttr(WINDOW_UserData, (Object *)window, (ULONG *)&gwin); if(AslRequestTags(filereq, + ASLFR_Window, gwin->win, + ASLFR_SleepWindow, TRUE, ASLFR_TitleText, messages_get("NetSurf"), ASLFR_Screen, scrn, ASLFR_DoSaveMode, FALSE, diff --git a/amiga/tree.c b/amiga/tree.c index 9c7b9d66b..bbacfdcb2 100644 --- a/amiga/tree.c +++ b/amiga/tree.c @@ -1000,6 +1000,8 @@ BOOL ami_tree_event(struct treeview_window *twin) { case 0: // export if(AslRequestTags(savereq, + ASLFR_Window, twin->win, + ASLFR_SleepWindow, TRUE, ASLFR_TitleText,messages_get("NetSurf"), ASLFR_Screen,scrn, ASLFR_InitialFile,"tree_export.html", |