summaryrefslogtreecommitdiff
path: root/amiga/gui.c
diff options
context:
space:
mode:
authorChris Young <chris@unsatisfactorysoftware.co.uk>2013-05-31 23:25:05 +0100
committerChris Young <chris@unsatisfactorysoftware.co.uk>2013-05-31 23:25:05 +0100
commit8b586b2d67dad1f7d874091664ab582936e15dc4 (patch)
tree30e06f7ee5d57edf0d882ff98ac82f5eb3bb67cd /amiga/gui.c
parent864762cbe60d04ba978ddbd9bf125240dd26f631 (diff)
downloadnetsurf-8b586b2d67dad1f7d874091664ab582936e15dc4.tar.gz
netsurf-8b586b2d67dad1f7d874091664ab582936e15dc4.tar.bz2
Fix a crash when edit settings if NetSurf is running on the WB screen
Rename use_pubscreen to make it clearer what the option is for
Diffstat (limited to 'amiga/gui.c')
-rw-r--r--amiga/gui.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/amiga/gui.c b/amiga/gui.c
index b1786ce46..536981c56 100644
--- a/amiga/gui.c
+++ b/amiga/gui.c
@@ -690,7 +690,7 @@ void ami_openscreen(void)
compositing = ~0UL;
else compositing = nsoption_int(screen_compositing);
- if (nsoption_charp(use_pubscreen) == NULL)
+ if (nsoption_charp(pubscreen_name) == NULL)
{
if((nsoption_charp(screen_modeid)) &&
(strncmp(nsoption_charp(screen_modeid), "0x", 2) == 0))
@@ -739,15 +739,15 @@ void ami_openscreen(void)
}
else
{
- nsoption_set_charp(use_pubscreen,
+ nsoption_set_charp(pubscreen_name,
strdup("Workbench"));
}
}
}
- if (nsoption_charp(use_pubscreen) != NULL)
+ if (nsoption_charp(pubscreen_name) != NULL)
{
- scrn = LockPubScreen(nsoption_charp(use_pubscreen));
+ scrn = LockPubScreen(nsoption_charp(pubscreen_name));
if(scrn == NULL)
{
@@ -3275,9 +3275,9 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw,
ULONG addtabclosegadget = TAG_IGNORE;
ULONG iconifygadget = FALSE;
- if (nsoption_charp(use_pubscreen) &&
+ if (nsoption_charp(pubscreen_name) &&
(locked_screen == TRUE) &&
- (strcmp(nsoption_charp(use_pubscreen), "Workbench") == 0))
+ (strcmp(nsoption_charp(pubscreen_name), "Workbench") == 0))
iconifygadget = TRUE;
ami_create_menu(g->shared);