summaryrefslogtreecommitdiff
path: root/riscos/help.c
diff options
context:
space:
mode:
authorRichard Wilson <rjw@netsurf-browser.org>2007-10-10 21:22:36 +0000
committerRichard Wilson <rjw@netsurf-browser.org>2007-10-10 21:22:36 +0000
commit08ea9e706bef92eb60efaf38937e8864466cf3fa (patch)
tree429d305e3fc11c8e670a29079eea5cf6d37d3a4b /riscos/help.c
parentcab5913aeee8a96ef32a331c1843e06349c23405 (diff)
downloadnetsurf-08ea9e706bef92eb60efaf38937e8864466cf3fa.tar.gz
netsurf-08ea9e706bef92eb60efaf38937e8864466cf3fa.tar.bz2
Allow interactive help to be turned off (implement 1793020)
svn path=/trunk/netsurf/; revision=3631
Diffstat (limited to 'riscos/help.c')
-rw-r--r--riscos/help.c9
1 files changed, 9 insertions, 0 deletions
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> */
help_start = getenv("Help$Start");