Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/2dd97b0b8e1f363542dddb403d515cce132b7f29
...commit
http://git.netsurf-browser.org/netsurf.git/commit/2dd97b0b8e1f363542dddb403d515cce132b7f29
...tree
http://git.netsurf-browser.org/netsurf.git/tree/2dd97b0b8e1f363542dddb403d515cce132b7f29
The branch, master has been updated
via 2dd97b0b8e1f363542dddb403d515cce132b7f29 (commit)
from 4b91c43003cdcbca09a72ce408d1e8cb93ad83e6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commitdiff
http://git.netsurf-browser.org/netsurf.git/commit/?id=2dd97b0b8e1f363542dddb403d515cce132b7f29
commit 2dd97b0b8e1f363542dddb403d515cce132b7f29
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Fix brokenness caused by recent changes
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 1fc72c3..236aed6 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -350,20 +350,18 @@ static bool ami_gui_check_resource(char *fullpath, const
char *file)
BPTR lock = 0;
size_t fullpath_len = 1024;
- if(ami_gui_map_filename(&remapped, fullpath, file, "Resource.map") ==
true) {
- netsurf_mkpath(&fullpath, &fullpath_len, 2, fullpath, remapped);
+ ami_gui_map_filename(&remapped, fullpath, file, "Resource.map");
+ netsurf_mkpath(&fullpath, &fullpath_len, 2, fullpath, remapped);
- lock = Lock(fullpath, ACCESS_READ);
- if(lock)
- {
- UnLock(lock);
- found = true;
- }
-
- if(found) LOG("Found %s", fullpath);
- free(remapped);
+ lock = Lock(fullpath, ACCESS_READ);
+ if(lock) {
+ UnLock(lock);
+ found = true;
}
+ if(found) LOG("Found %s", fullpath);
+ free(remapped);
+
return found;
}
@@ -4499,7 +4497,7 @@ static void gui_window_destroy(struct gui_window *g)
cur_gw = NULL;
- if(g->tab_node) {
+ if(g->shared->tabs > 1) {
SetGadgetAttrs((struct Gadget
*)g->shared->objects[GID_TABS],g->shared->win,NULL,
CLICKTAB_Labels,~0,
TAG_DONE);
@@ -4529,7 +4527,7 @@ static void gui_window_destroy(struct gui_window *g)
if((g->shared->tabs == 1) && (nsoption_bool(tab_always_show) ==
false))
ami_toggletabbar(g->shared, false);
- free(g->tabtitle);
+ if(g->tabtitle) free(g->tabtitle);
free(g);
return;
}
@@ -4575,6 +4573,7 @@ static void gui_window_destroy(struct gui_window *g)
Remove(g->tab_node);
FreeClickTabNode(g->tab_node);
}
+ if(g->tabtitle) free(g->tabtitle);
free(g); // g->shared should be freed by DelObject()
if(IsMinListEmpty(window_list))
@@ -5750,9 +5749,8 @@ int main(int argc, char** argv)
netsurf_exit();
- ami_nsoption_free();
nsoption_finalise(nsoptions, nsoptions_default);
-
+ ami_nsoption_free();
free(current_user_dir);
FreeVec(current_user_faviconcache);
FreeVec(current_user);
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/gui.c | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 1fc72c3..236aed6 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -350,20 +350,18 @@ static bool ami_gui_check_resource(char *fullpath, const
char *file)
BPTR lock = 0;
size_t fullpath_len = 1024;
- if(ami_gui_map_filename(&remapped, fullpath, file, "Resource.map") ==
true) {
- netsurf_mkpath(&fullpath, &fullpath_len, 2, fullpath, remapped);
+ ami_gui_map_filename(&remapped, fullpath, file, "Resource.map");
+ netsurf_mkpath(&fullpath, &fullpath_len, 2, fullpath, remapped);
- lock = Lock(fullpath, ACCESS_READ);
- if(lock)
- {
- UnLock(lock);
- found = true;
- }
-
- if(found) LOG("Found %s", fullpath);
- free(remapped);
+ lock = Lock(fullpath, ACCESS_READ);
+ if(lock) {
+ UnLock(lock);
+ found = true;
}
+ if(found) LOG("Found %s", fullpath);
+ free(remapped);
+
return found;
}
@@ -4499,7 +4497,7 @@ static void gui_window_destroy(struct gui_window *g)
cur_gw = NULL;
- if(g->tab_node) {
+ if(g->shared->tabs > 1) {
SetGadgetAttrs((struct Gadget
*)g->shared->objects[GID_TABS],g->shared->win,NULL,
CLICKTAB_Labels,~0,
TAG_DONE);
@@ -4529,7 +4527,7 @@ static void gui_window_destroy(struct gui_window *g)
if((g->shared->tabs == 1) && (nsoption_bool(tab_always_show) ==
false))
ami_toggletabbar(g->shared, false);
- free(g->tabtitle);
+ if(g->tabtitle) free(g->tabtitle);
free(g);
return;
}
@@ -4575,6 +4573,7 @@ static void gui_window_destroy(struct gui_window *g)
Remove(g->tab_node);
FreeClickTabNode(g->tab_node);
}
+ if(g->tabtitle) free(g->tabtitle);
free(g); // g->shared should be freed by DelObject()
if(IsMinListEmpty(window_list))
@@ -5750,9 +5749,8 @@ int main(int argc, char** argv)
netsurf_exit();
- ami_nsoption_free();
nsoption_finalise(nsoptions, nsoptions_default);
-
+ ami_nsoption_free();
free(current_user_dir);
FreeVec(current_user_faviconcache);
FreeVec(current_user);
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
