From 73e7ffff837d7339deb362098e24827946e38f6a Mon Sep 17 00:00:00 2001
From: PatrikLundell <j.patrik.r.lundell@gmail.com>
Date: Sat, 18 Aug 2018 18:03:00 +0200
Subject: [PATCH] Made cancel state sensitive

---
 plugins/embark-assistant/overlay.cpp | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/plugins/embark-assistant/overlay.cpp b/plugins/embark-assistant/overlay.cpp
index 63c70996c..75e6258a3 100644
--- a/plugins/embark-assistant/overlay.cpp
+++ b/plugins/embark-assistant/overlay.cpp
@@ -103,9 +103,13 @@ namespace embark_assist {
                     state->embark_update();
                 }
                 else if (input->count(df::interface_key::CUSTOM_C)) {
-                    state->match_active = false;
-                    state->matching = false;
-                    state->clear_match_callback();
+                    if (state->matching) {
+                        state->matching = false;
+                    }
+                    else {
+                        state->match_active = false;
+                        state->clear_match_callback();
+                    }
                 }
                 else if (input->count(df::interface_key::CUSTOM_F)) {
                     if (!state->match_active && !state->matching) {