diff options
| author | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2013-08-20 19:43:13 +0100 |
|---|---|---|
| committer | Chris Young <chris@unsatisfactorysoftware.co.uk> | 2013-08-20 19:43:13 +0100 |
| commit | 011ba501a7d1ce4ef4a9d4e7f107569bdce6b847 (patch) | |
| tree | 9adaa53ddc1711317a1c6874ac65818d5fd87e49 | |
| parent | 1761d390de339c178caa829cca5c1eb573f967cf (diff) | |
| download | netsurf-011ba501a7d1ce4ef4a9d4e7f107569bdce6b847.tar.gz netsurf-011ba501a7d1ce4ef4a9d4e7f107569bdce6b847.tar.bz2 | |
Make some global DrawInfo local to the function it is needed in.
| -rw-r--r-- | amiga/gui.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/amiga/gui.c b/amiga/gui.c index d77ec9ba3..f60e47835 100644 --- a/amiga/gui.c +++ b/amiga/gui.c @@ -167,8 +167,6 @@ const char tree_directory_icon_name[] = "def_drawer.info"; const char tree_content_icon_name[] = "def_project.info"; static const __attribute__((used)) char *stack_cookie = "\0$STACK:131072\0"; -static struct DrawInfo *dri; - const char * const versvn; const char * const verdate; @@ -761,11 +759,9 @@ void ami_openscreen(void) } locked_screen = TRUE; } - dri = GetScreenDrawInfo(scrn); - ami_font_setdevicedpi(id); + ami_font_setdevicedpi(id); ami_set_screen_defaults(scrn); - //ami_help_new_screen(scrn); } @@ -2762,7 +2758,6 @@ void gui_quit(void) ami_arexx_cleanup(); ami_free_layers(&browserglob); - FreeScreenDrawInfo(scrn, dri); ami_close_fonts(); ami_gui_close_screen(scrn, locked_screen); @@ -3641,7 +3636,8 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, if(nsoption_bool(kiosk_mode) == false) { ULONG sz, size1, size2; - + struct DrawInfo *dri = GetScreenDrawInfo(scrn); + sz = ami_get_border_gadget_balance(g->shared, (ULONG *)&size1, (ULONG *)&size2); @@ -3698,6 +3694,8 @@ struct gui_window *gui_create_browser_window(struct browser_window *bw, RefreshGadgets((APTR)g->shared->objects[GID_STATUS], g->shared->win, NULL); + FreeScreenDrawInfo(scrn, dri); + ami_gui_hotlist_toolbar_add(g->shared); /* is this the right place for this? */ if(nsoption_bool(tab_always_show)) ami_toggletabbar(g->shared, true); } |