From f1bacbb166464ef14db23fbf926bf8005a4f30e5 Mon Sep 17 00:00:00 2001 From: Matthew Flatt Date: Mon, 9 Jun 2008 14:23:12 +0000 Subject: [PATCH] ignore failures when writing the commentary-window position/size to the preferences file, mainly because a security guard might disallow it for nested slideshows svn: r10194 --- collects/slideshow/viewer.ss | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/collects/slideshow/viewer.ss b/collects/slideshow/viewer.ss index 1545baab0b..56239d99ed 100644 --- a/collects/slideshow/viewer.ss +++ b/collects/slideshow/viewer.ss @@ -19,6 +19,7 @@ ;; Needed for browsing (define original-security-guard (current-security-guard)) + (define orig-err-string-handler (error-value->string-handler)) (define-unit viewer@ (import (prefix config: cmdline^) core^) @@ -485,15 +486,17 @@ (define c-frame (new (class talk-frame% (define/override (on-move x y) (super on-move x y) - (parameterize ([current-security-guard original-security-guard]) - (with-handlers ([void raise]) ; prevents exn handler from grabbing security guard + (parameterize ([current-security-guard original-security-guard] + [error-value->string-handler orig-err-string-handler]) + (with-handlers ([void void]) ; also prevents exn handler from grabbing security guard (put-preferences '(slideshow:commentary-x slideshow:commentary-y) (list x y) void)))) (define/override (on-size w h) (super on-size w h) - (parameterize ([current-security-guard original-security-guard]) - (with-handlers ([void raise]) ; prevents exn handler from grabbing security guard + (parameterize ([current-security-guard original-security-guard] + [error-value->string-handler orig-err-string-handler]) + (with-handlers ([void void]) ; also prevents exn handler from grabbing security guard (put-preferences '(slideshow:commentary-width slideshow:commentary-height) (list w h) void))))