steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

If rendering an error popup fails, don't open an endless stream

db4
Slava Pestov 2008-11-19 21:57:59 -06:00
parent 8f0b335f4b
commit bcd2ffc830
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
basis/ui/gadgets/worlds/worlds.factor
View File

@ -30,7 +30,7 @@ ERROR: no-world-found ;
: (request-focus) ( child world ? -- ) : (request-focus) ( child world ? -- )
pick parent>> pick eq? [ pick parent>> pick eq? [
>r >r dup parent>> dup r> r> [ dup parent>> dup ] 2dip
[ (request-focus) ] keep [ (request-focus) ] keep
] unless focus-child ; ] unless focus-child ;
@ -80,7 +80,7 @@ SYMBOL: ui-error-hook
: ui-error ( error -- ) : ui-error ( error -- )
ui-error-hook get [ call ] [ print-error ] if* ; ui-error-hook get [ call ] [ print-error ] if* ;
[ rethrow ] ui-error-hook set-global ui-error-hook global [ [ rethrow ] or ] change-at
: draw-world ( world -- ) : draw-world ( world -- )
dup draw-world? [ dup draw-world? [

10
basis/ui/tools/debugger/debugger.factor
View File

@ -35,7 +35,15 @@ M: debugger focusable-child* restarts>> ;
#! No restarts for the debugger window #! No restarts for the debugger window
f [ drop ] <debugger> "Error" open-window ; f [ drop ] <debugger> "Error" open-window ;
[ debugger-window ] ui-error-hook set-global GENERIC: error-in-debugger? ( error -- ? )
M: world-error error-in-debugger? world>> gadget-child debugger? ;
M: object error-in-debugger? drop f ;
[
dup error-in-debugger? [ rethrow ] [ debugger-window ] if
] ui-error-hook set-global
M: world-error error. M: world-error error.
"An error occurred while drawing the world " write "An error occurred while drawing the world " write