Gitweb links:
...log
http://git.netsurf-browser.org/netsurf.git/shortlog/54e31b65d14dd1e228106eae0c60ab42802a97ed
...commit
http://git.netsurf-browser.org/netsurf.git/commit/54e31b65d14dd1e228106eae0c60ab42802a97ed
...tree
http://git.netsurf-browser.org/netsurf.git/tree/54e31b65d14dd1e228106eae0c60ab42802a97ed
The branch, master has been updated
via 54e31b65d14dd1e228106eae0c60ab42802a97ed (commit)
from 4a93beb0393a8abddeb606cbb29a99bc1d73b67e (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=54e31b65d14dd1e228106eae0c60ab42802a97ed
commit 54e31b65d14dd1e228106eae0c60ab42802a97ed
Author: Chris Young <[email protected]>
Commit: Chris Young <[email protected]>
Guard against crashing when opening the splash screen
Add extra logging for when things go wrong at this stage
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 6dca47a..7678505 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -5347,9 +5347,24 @@ Object *ami_gui_splash_open(void)
LayoutEnd,
EndWindow;
+ if(win_obj == NULL) {
+ LOG("Splash window object not created");
+ return NULL;
+ }
+
LOG("Attempting to open splash window...");
win = RA_OpenWindow(win_obj);
+ if(win == NULL) {
+ LOG("Splash window did not open");
+ return NULL;
+ }
+
+ if(bm_obj == NULL) {
+ LOG("BitMap object not created");
+ return NULL;
+ }
+
GetAttrs(bm_obj, IA_Top, &top,
IA_Left, &left,
TAG_DONE);
-----------------------------------------------------------------------
Summary of changes:
frontends/amiga/gui.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/frontends/amiga/gui.c b/frontends/amiga/gui.c
index 6dca47a..7678505 100644
--- a/frontends/amiga/gui.c
+++ b/frontends/amiga/gui.c
@@ -5347,9 +5347,24 @@ Object *ami_gui_splash_open(void)
LayoutEnd,
EndWindow;
+ if(win_obj == NULL) {
+ LOG("Splash window object not created");
+ return NULL;
+ }
+
LOG("Attempting to open splash window...");
win = RA_OpenWindow(win_obj);
+ if(win == NULL) {
+ LOG("Splash window did not open");
+ return NULL;
+ }
+
+ if(bm_obj == NULL) {
+ LOG("BitMap object not created");
+ return NULL;
+ }
+
GetAttrs(bm_obj, IA_Top, &top,
IA_Left, &left,
TAG_DONE);
--
NetSurf Browser
_______________________________________________
netsurf-commits mailing list
[email protected]
http://listmaster.pepperfish.net/cgi-bin/mailman/listinfo/netsurf-commits-netsurf-browser.org
