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/options.h | |
| 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/options.h')
| -rw-r--r-- | amiga/options.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/amiga/options.h b/amiga/options.h index 97c69f76e..6f7289c6d 100644 --- a/amiga/options.h +++ b/amiga/options.h @@ -28,7 +28,6 @@ extern int option_cache_bitmaps; extern char *option_theme; extern bool option_utf8_clipboard; extern bool option_context_menu; -extern bool option_sticky_context_menu; extern bool option_truecolour_mouse_pointers; extern bool option_use_os_pointers; extern bool option_new_tab_active; @@ -76,8 +75,7 @@ char *option_modeid = 0; \ int option_cache_bitmaps = 0; \ char *option_theme = 0; \ bool option_utf8_clipboard = false; \ -bool option_context_menu = false; \ -bool option_sticky_context_menu = false; \ +bool option_context_menu = true; \ bool option_truecolour_mouse_pointers = false; \ bool option_use_os_pointers = true; \ bool option_new_tab_active = false; \ @@ -126,7 +124,6 @@ bool option_widescreen = false; \ { "theme", OPTION_STRING, &option_theme}, \ { "clipboard_write_utf8", OPTION_BOOL, &option_utf8_clipboard}, \ { "context_menu", OPTION_BOOL, &option_context_menu}, \ -{ "sticky_context_menu", OPTION_BOOL, &option_sticky_context_menu}, \ { "truecolour_mouse_pointers", OPTION_BOOL, &option_truecolour_mouse_pointers}, \ { "os_mouse_pointers", OPTION_BOOL, &option_use_os_pointers}, \ { "new_tab_is_active", OPTION_BOOL, &option_new_tab_active}, \ |