Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/53d07a8e462488891f248571fd27b00197790bf7
...commit
http://git.netsurf-browser.org/netsurf.git/commit/53d07a8e462488891f248571fd27b00197790bf7
...tree
http://git.netsurf-browser.org/netsurf.git/tree/53d07a8e462488891f248571fd27b00197790bf7
The branch, master has been updated
via 53d07a8e462488891f248571fd27b00197790bf7 (commit)
from 5c02f9bd97305da6ec9c23e80286dc4e4234ee4c (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=53d07a8e462488891f248571fd27b00197790bf7
commit 53d07a8e462488891f248571fd27b00197790bf7
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Amiga: try to guard against page info window being destroyed twice
diff --git a/frontends/amiga/pageinfo.c b/frontends/amiga/pageinfo.c
index 8b79a0a..d980281 100644
--- a/frontends/amiga/pageinfo.c
+++ b/frontends/amiga/pageinfo.c
@@ -67,9 +67,13 @@ ami_pageinfo_destroy(struct ami_corewindow *ami_cw)
{
nserror res;
struct ami_pageinfo_window *pageinfo_win = (struct ami_pageinfo_window
*)ami_cw;
- res = page_info_destroy(pageinfo_win->pi);
- if (res == NSERROR_OK) {
- ami_corewindow_fini(&pageinfo_win->core); /* closes the window
for us */
+ if(pageinfo_win->pi != NULL) {
+ res = page_info_destroy(pageinfo_win->pi);
+
+ if (res == NSERROR_OK) {
+ pageinfo_win->pi = NULL;
+ ami_corewindow_fini(&pageinfo_win->core); /* closes the
window for us */
+ }
}
}
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/pageinfo.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/frontends/amiga/pageinfo.c b/frontends/amiga/pageinfo.c
index 8b79a0a..d980281 100644
--- a/frontends/amiga/pageinfo.c
+++ b/frontends/amiga/pageinfo.c
@@ -67,9 +67,13 @@ ami_pageinfo_destroy(struct ami_corewindow *ami_cw)
{
nserror res;
struct ami_pageinfo_window *pageinfo_win = (struct ami_pageinfo_window
*)ami_cw;
- res = page_info_destroy(pageinfo_win->pi);
- if (res == NSERROR_OK) {
- ami_corewindow_fini(&pageinfo_win->core); /* closes the window
for us */
+ if(pageinfo_win->pi != NULL) {
+ res = page_info_destroy(pageinfo_win->pi);
+
+ if (res == NSERROR_OK) {
+ pageinfo_win->pi = NULL;
+ ami_corewindow_fini(&pageinfo_win->core); /* closes the
window for us */
+ }
}
}
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
