diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2011-09-02 17:31:47 +0000 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2011-09-02 17:31:47 +0000 |
| commit | 25fea2721df52567999bd9aaf3dd5046c350450e (patch) | |
| tree | e2755845cb552b687456b0337761eeb29112830b /amiga/context_menu.c | |
| parent | a7d4f08b77245cc66ace55e60032b194e1c9db13 (diff) | |
| download | netsurf-25fea2721df52567999bd9aaf3dd5046c350450e.tar.gz netsurf-25fea2721df52567999bd9aaf3dd5046c350450e.tar.bz2 | |
Avoid calling AllocSignal() until the last minute, as it causes PM_OPEN to initiate
an Intuition or Input deadlock.
Re-enable context menus as they are now safe.
Remove sticky context menus option as this can be set in GUI prefs as a global option.
svn path=/trunk/netsurf/; revision=12698
Diffstat (limited to 'amiga/context_menu.c')
| -rwxr-xr-x | amiga/context_menu.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/amiga/context_menu.c b/amiga/context_menu.c index 92ba1598d..5b02bc0c2 100755 --- a/amiga/context_menu.c +++ b/amiga/context_menu.c @@ -173,6 +173,7 @@ void ami_context_menu_show(struct gui_window_2 *gwin,int x,int y) int box_y=0; bool menuhascontent = false; bool no_url = true, no_obj = true, no_sel = true; + ULONG ret = 0; if(!cc) return; if(content_get_type(cc) != CONTENT_HTML) return; @@ -408,6 +409,7 @@ void ami_context_menu_show(struct gui_window_2 *gwin,int x,int y) if(!menuhascontent) return; gui_window_set_pointer(gwin->bw->window,GUI_POINTER_DEFAULT); + IDoMethod(ctxmenuobj,PM_OPEN,gwin->win); } |