From 2e04ba83da0a14c5f238ec00c7ede4d3b905178a Mon Sep 17 00:00:00 2001 From: "silver%warwickcompsoc.co.uk" Date: Mon, 26 Apr 2004 10:05:21 +0000 Subject: [PATCH] Bug 162144 - Handle exceptions thrown by the file picker properly. r=rginda@hacksrus.com git-svn-id: svn://10.0.0.236/trunk@155527 18797224-902f-48f8-a5cc-f745e15eee43 --- .../venkman/resources/content/file-utils.js | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/mozilla/extensions/venkman/resources/content/file-utils.js b/mozilla/extensions/venkman/resources/content/file-utils.js index 2594106a310..a2cb714d496 100644 --- a/mozilla/extensions/venkman/resources/content/file-utils.js +++ b/mozilla/extensions/venkman/resources/content/file-utils.js @@ -175,7 +175,7 @@ function pickSaveAs (title, typeList, defaultFile, defaultDir) picker.init (window, title ? title : futils.MSG_SAVE_AS, Components.interfaces.nsIFilePicker.modeSave); - var reason; + var reason = PICK_CANCEL; try { @@ -214,7 +214,16 @@ function pickOpen (title, typeList, defaultFile, defaultDir) picker.init (window, title ? title : futils.MSG_OPEN, Components.interfaces.nsIFilePicker.modeOpen); - var rv = picker.show(); + var rv = PICK_CANCEL; + + try + { + rv = picker.show(); + } + catch (ex) + { + dd ("caught exception from file picker: " + ex); + } if (rv != PICK_CANCEL) futils.lastOpenDir = picker.file.parent;