From 10b8170f55580c6cbb9328596617901dfda7d0c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ingo=20B=C3=BCrk?= <ingo.buerk@tngtech.com>
Date: Sun, 20 May 2018 11:23:19 +0200
Subject: [PATCH 1/2] Added ISSUE_TEMPLATE.md

---
 .github/ISSUE_TEMPLATE.md | 29 +++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
new file mode 100644
index 0000000..591fdfe
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE.md
@@ -0,0 +1,29 @@
+<!--
+PLEASE HELP US PROCESS GITHUB ISSUES FASTER BY PROVIDING THE FOLLOWING INFORMATION.
+-->
+
+## I'm submitting a…
+<!-- Please check one of the following options with "x" -->
+<pre>
+[ ] Bug
+[ ] Feature Request
+[ ] Other (Please describe in detail)
+</pre>
+
+## Current Behavior
+<!-- Describe the current behavior -->
+
+## Expected Behavior
+<!-- Describe the desired behavior you expect after mitigation of the issue -->
+
+## Reproduction Instructions
+<!--
+For bug reports, please provide detailed instructions on how the bug can be reproduced.
+For feature requests, you can remove this section.
+-->
+
+## Environment
+Output of `i3lock --version`:
+<pre>
+i3lock version: 
+</pre>

From 50c81d5717ad34bdd20b78ca4bd7342830b32fa2 Mon Sep 17 00:00:00 2001
From: Guillaume Maudoux <guillaume.maudoux@uclouvain.be>
Date: Mon, 25 Jun 2018 15:48:45 +0200
Subject: [PATCH 2/2] Keep only the last attempt for retry_verification

---
 i3lock.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/i3lock.c b/i3lock.c
index 13adc2b..fd4d1d2 100644
--- a/i3lock.c
+++ b/i3lock.c
@@ -445,6 +445,12 @@ static void handle_key_press(xcb_key_press_event_t *event) {
             return;
         default:
             skip_repeated_empty_password = false;
+            // A new password is being entered, but a previous one is pending.
+            // Discard the old one and clear the retry_verification flag.
+            if (retry_verification) {
+                retry_verification = false;
+                clear_input();
+            }
     }
 
     switch (ksym) {