From ea7ae0402522da41075db1c2cb4918f2575bf2e8 Mon Sep 17 00:00:00 2001
From: Giulio Eulisse <giulio.eulisse@cern.ch>
Date: Sun, 24 May 2020 23:45:50 +0200
Subject: [PATCH] Adapt to requests by @rbx

---
 fairmq/plugins/Control.cxx | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/fairmq/plugins/Control.cxx b/fairmq/plugins/Control.cxx
index 1a186c76..1e646400 100644
--- a/fairmq/plugins/Control.cxx
+++ b/fairmq/plugins/Control.cxx
@@ -23,7 +23,6 @@ namespace
 {
     std::atomic<sig_atomic_t> gLastSignal(0);
     std::atomic<int> gSignalCount(0);
-    std::atomic<bool> gSigtermRequested(false);
 
     extern "C" auto sigint_handler(int signal) -> void
     {
@@ -38,7 +37,6 @@ namespace
     extern "C" auto sigterm_handler(int signal) -> void
     {
         ++gSignalCount;
-        gSigtermRequested = true;
         gLastSignal = signal;
     }
 }
@@ -398,7 +396,7 @@ auto Control::SignalHandler() -> void
         this_thread::sleep_for(chrono::milliseconds(100));
     }
 
-    if (!fPluginShutdownRequested || gSigtermRequested) {
+    if (!fPluginShutdownRequested) {
         LOG(info) << "Received device shutdown request (signal " << gLastSignal << ").";
         LOG(info) << "Waiting for graceful device shutdown. Hit Ctrl-C again to abort immediately.";