From d317b020f06221a11fd82600e180df4fa1ea0c69 Mon Sep 17 00:00:00 2001 From: Beaudan Date: Fri, 1 Mar 2019 15:15:30 +1100 Subject: [PATCH] Close the database if the password is incorrect, fixes windows crash --- app/sql.js | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/app/sql.js b/app/sql.js index 8a60085cc..cf8fb38ac 100644 --- a/app/sql.js +++ b/app/sql.js @@ -679,13 +679,21 @@ async function initialize({ configDir, key }) { // console._log(`EXPLAIN QUERY PLAN ${statement}\n`, data && data.detail); // }); - await setupSQLCipher(promisified, { key }); - await updateSchema(promisified); + try { + await setupSQLCipher(promisified, { key }); + await updateSchema(promisified); + } catch (e) { + await promisified.close(); + throw e; + } db = promisified; } async function close() { + if (!db) { + return; + } const dbRef = db; db = null; await dbRef.close();