--- a/DeviceWorkstation.st Tue Sep 14 20:07:13 2004 +0200
+++ b/DeviceWorkstation.st Wed Sep 15 00:51:48 2004 +0200
@@ -635,29 +635,27 @@
(p notNil and:[p ~~ Processor activeProcess]) ifTrue:[
'DeviceWorkstation [info]: interrupting: ' infoPrint. p infoPrintCR.
p interruptWith:[
- errID == #DisplayError ifTrue:[
+ (errID == #DisplayError and:[theSignal isHandled not]) ifTrue:[
"unhandled display errors are ignored"
- theSignal isHandled ifFalse:[
- ErrorPrinting ifTrue:[
- ('DeviceWorkstation [error]: ' , msg) errorPrintCR
- ].
- ^ self
- ]
+ ErrorPrinting ifTrue:[
+ ('DeviceWorkstation [error]: ' , msg) errorPrintCR
+ ].
+ ] ifFalse:[
+ 'DeviceWorkstation [info]: raising exception ...' infoPrintCR.
+ theSignal mayProceed ifTrue:[
+ theSignal raiseRequestWith:badResource errorString:msg.
+ ] ifFalse:[
+ theSignal raiseWith:badResource errorString:msg.
+ ].
+ 'DeviceWorkstation [warning]: exception returned - send brokenConnection' errorPrintCR.
+ theDevice brokenConnection.
+ 'DeviceWorkstation [warning]: stopping dispatch' errorPrintCR.
+ theDevice stopDispatch.
].
- 'DeviceWorkstation [info]: raising exception ...' infoPrintCR.
- theSignal mayProceed ifTrue:[
- theSignal raiseRequestWith:badResource errorString:msg.
- ] ifFalse:[
- theSignal raiseWith:badResource errorString:msg.
- ].
- 'DeviceWorkstation [warning]: exception returned - send brokenConnection' errorPrintCR.
- theDevice brokenConnection.
- 'DeviceWorkstation [warning]: stopping dispatch' errorPrintCR.
- theDevice stopDispatch.
].
^ self.
"/ Processor reschedule.
-"/ AbortSignal raise.
+"/ AbortOperationRequest raise.
].
].
@@ -7439,7 +7437,7 @@
!DeviceWorkstation class methodsFor:'documentation'!
version
- ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.473 2004-09-13 12:18:14 ca Exp $'
+ ^ '$Header: /cvs/stx/stx/libview/DeviceWorkstation.st,v 1.474 2004-09-14 22:51:48 stefan Exp $'
! !
DeviceWorkstation initialize!