From 08ea9e706bef92eb60efaf38937e8864466cf3fa Mon Sep 17 00:00:00 2001 From: Richard Wilson Date: Wed, 10 Oct 2007 21:22:36 +0000 Subject: Allow interactive help to be turned off (implement 1793020) svn path=/trunk/netsurf/; revision=3631 --- riscos/help.c | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'riscos/help.c') diff --git a/riscos/help.c b/riscos/help.c index 3319c92ea..fb0aa97de 100644 --- a/riscos/help.c +++ b/riscos/help.c @@ -31,6 +31,7 @@ #include "riscos/gui.h" #include "riscos/help.h" #include "riscos/menus.h" +#include "riscos/options.h" #include "riscos/theme.h" #include "riscos/treeview.h" #include "riscos/wimp.h" @@ -99,6 +100,10 @@ void ro_gui_interactive_help_request(wimp_message *message) { os_error *error; const char *auto_text; int i; + + /* check we aren't turned off */ + if (!option_interactive_help) + return; /* only accept help requests */ if ((!message) || (message->action != message_HELP_REQUEST)) @@ -315,6 +320,10 @@ void ro_gui_interactive_help_start(void) { char *help_start; wimp_t task = 0; os_error *error; + + /* don't launch a second copy of anything */ + if (ro_gui_interactive_help_available()) + return; /* launch */ help_start = getenv("Help$Start"); -- cgit v1.2.3