From 1fb7089e732194906af8b73d63c21bfef6818cc0 Mon Sep 17 00:00:00 2001
From: Jaifroid <egk10@cam.ac.uk>
Date: Thu, 11 Oct 2018 20:25:47 +0100
Subject: [PATCH] Fix critical error when previously picked archive has been
 deleted

Former-commit-id: 7de0c432000f9b53971a58918c9e7d9a8b94c158 [formerly e9dec39ac792f00e6aa2ac3dd8dccb0b812141ca]
Former-commit-id: d8804e5c01c76137b796e0597a4b2ac505f2b2d5
---
 www/js/app.js | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/www/js/app.js b/www/js/app.js
index 13f2ba37..8a86c63f 100644
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -1358,9 +1358,14 @@ define(['jquery', 'zimArchiveLoader', 'util', 'uiUtil', 'cookies', 'q', 'module'
                             return;
                         } else { //Check if user previously picked a specific file rather than a folder
                             if (params.pickedFile && typeof MSApp !== 'undefined') {
-                                selectedStorage = MSApp.createFileFromStorageFile(params.pickedFile);
-                                setLocalArchiveFromFileList([selectedStorage]);
-                                return;
+                                try {
+                                    selectedStorage = MSApp.createFileFromStorageFile(params.pickedFile);
+                                    setLocalArchiveFromFileList([selectedStorage]);
+                                    return;
+                                } catch (err){
+                                    // Probably user has moved or deleted the previously selected file
+                                    console.error("The previously picked archive can no longer be found!");
+                                }
                             }
                         }
                         //There was no picked file or folder, so we'll try setting the default localStorage