From 29c70236043b1cacd23823c24db6b004fc2965f0 Mon Sep 17 00:00:00 2001
From: karimpwnz <karim@karimrahal.com>
Date: Sat, 2 Jan 2021 03:41:49 +0200
Subject: [PATCH] Capture KeyringLocked exception and allow manual password
 entry

---
 jrnl/EncryptedJournal.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/jrnl/EncryptedJournal.py b/jrnl/EncryptedJournal.py
index e1d248aa..e672c563 100644
--- a/jrnl/EncryptedJournal.py
+++ b/jrnl/EncryptedJournal.py
@@ -176,7 +176,7 @@ def get_keychain(journal_name):
 
     try:
         return keyring.get_password("jrnl", journal_name)
-    except RuntimeError:
+    except (keyring.errors.KeyringLocked, RuntimeError):
         return ""