# HG changeset patch # User Stefan Vogel # Date 953064979 -3600 # Node ID c6cbcd34adf8ec5d417499a79fa4851edfce1fdf # Parent 98fd08dcf36698ba945cd214af0d461662c9ab33 Allow handling of DisplayTimeout errors. diff -r 98fd08dcf366 -r c6cbcd34adf8 DeviceWorkstation.st --- a/DeviceWorkstation.st Thu Mar 09 15:59:13 2000 +0100 +++ b/DeviceWorkstation.st Tue Mar 14 21:16:19 2000 +0100 @@ -525,18 +525,10 @@ "/ Processor reschedule. "/ AbortSignal raise. ]. - theDevice brokenConnection. - p == Processor activeProcess ifTrue:[ - AbortSignal raise. - ] ]. - - "/ 'broken connection' printCR. - theDevice brokenConnection. - ^ self. ]. - theSignal isHandled ifTrue:[ + (theSignal isHandled or:[theSignal handlerBlock notNil]) ifTrue:[ "/ 'DeviceWorkstation [info]: interrupting current process: ' infoPrint. "/ Processor activeProcess displayString infoPrintCR. @@ -550,7 +542,15 @@ errorString:msg. ]. ]. -"/ AbortSignal raise. + + theDevice notNil ifTrue:[ + "/ 'broken connection' printCR. + theDevice brokenConnection. + p == Processor activeProcess ifTrue:[ + AbortSignal raise. + ] + ]. + "Modified: 11.4.1997 / 11:28:27 / cg" ! @@ -6858,6 +6858,6 @@ !DeviceWorkstation class methodsFor:'documentation'! version - ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.364 2000-02-12 15:31:26 cg Exp $' + ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.365 2000-03-14 20:16:19 stefan Exp $' ! ! DeviceWorkstation initialize!