From 7e22ae2ad9d873b03da0aafd392cbded32b1063f Mon Sep 17 00:00:00 2001
From: Jamie Cameron <jcameron@webmin.com>
Date: Fri, 10 Oct 2014 18:55:07 -0700
Subject: [PATCH] Close the upload window even if the Java callback fails

---
 file/file-lib.pl | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/file/file-lib.pl b/file/file-lib.pl
index c54a8f0fe..047b143cc 100755
--- a/file/file-lib.pl
+++ b/file/file-lib.pl
@@ -385,9 +385,11 @@ if ($zip) {
 	}
 $info = &file_info_line(&unmake_chroot($refresh), $refresh);
 print "<script>\n";
-print "opener.document.FileManager.",
+print "try {\n";
+print "  opener.document.FileManager.",
       "upload_notify(\"".&quote_escape($refresh)."\", ",
       "\"".&quote_escape($info)."\");\n";
+print "} catch(err) { }\n";
 if ($err) {
 	$err =~ s/\r//g;
 	$err =~ s/\n/\\n/g;