From 8e7603e6a263eb765df4886a321537f209d88245 Mon Sep 17 00:00:00 2001
From: Chris Young <chris@unsatisfactorysoftware.co.uk>
Date: Sun, 15 Jan 2017 16:10:23 +0000
Subject: Update JS menu check state when prefs option is toggled

---
 frontends/amiga/gui_menu.c    | 8 ++++++++
 frontends/amiga/gui_options.c | 4 +++-
 frontends/amiga/menu.c        | 2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'frontends/amiga')

diff --git a/frontends/amiga/gui_menu.c b/frontends/amiga/gui_menu.c
index 791182b7a..3f053a571 100644
--- a/frontends/amiga/gui_menu.c
+++ b/frontends/amiga/gui_menu.c
@@ -598,12 +598,20 @@ static void ami_gui_menu_set_checked_mc(struct Menu *menu, int item, bool check)
 		check_state = 0;
 	}
 
+	if(menu == NULL) {
+		menu = gui_menu;
+	}
+
 	IDoMethod((Object *)menu, MM_SETSTATE, 0, item, MS_CHECKED, check_state);
 }
 #endif
 
 static void ami_gui_menu_set_checked_gt(struct Menu *menu, int item, bool check)
 {
+	if(menu == NULL) {
+		return;
+	}
+
 	if(check == true) {
 		if((ItemAddress(menu, ami_gui_menu_number(item))->Flags & CHECKED) == 0)
 			ItemAddress(menu, ami_gui_menu_number(item))->Flags ^= CHECKED;
diff --git a/frontends/amiga/gui_options.c b/frontends/amiga/gui_options.c
index b349e43c1..78dea5820 100755
--- a/frontends/amiga/gui_options.c
+++ b/frontends/amiga/gui_options.c
@@ -1727,7 +1727,9 @@ static void ami_gui_opts_use(bool save)
 	} else {
 		nsoption_set_bool(enable_javascript, false);
 	}
-	
+
+	ami_gui_menu_set_checked(NULL, M_JS, nsoption_bool(enable_javascript));
+
 	GetAttr(GA_Selected,gow->objects[GID_OPTS_DONOTTRACK],(ULONG *)&data);
 	if (data) {
 		nsoption_set_bool(do_not_track, true);
diff --git a/frontends/amiga/menu.c b/frontends/amiga/menu.c
index 6e33d5e05..04c6eb07f 100644
--- a/frontends/amiga/menu.c
+++ b/frontends/amiga/menu.c
@@ -39,7 +39,7 @@
 #include <reaction/reaction_macros.h>
 
 #include "utils/log.h"
-#include "utils/utils.h"
+#include "utils/messages.h"
 
 #include "amiga/gui.h"
 #include "amiga/libs.h"
-- 
cgit v1.2.3