From 2a1a2a603ca7e84e829c4d571b57cc231c4c4443 Mon Sep 17 00:00:00 2001 From: BPanther Date: Mon, 30 Dec 2019 17:43:28 +0100 Subject: [PATCH] femanager, small fix Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/3faf6070a6b49443a6f6119a566084a8db44bb53 Author: BPanther Date: 2019-12-30 (Mon, 30 Dec 2019) --- src/zapit/src/femanager.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/zapit/src/femanager.cpp b/src/zapit/src/femanager.cpp index 7924af227..2a69b5100 100644 --- a/src/zapit/src/femanager.cpp +++ b/src/zapit/src/femanager.cpp @@ -516,21 +516,27 @@ void CFEManager::Open(int _fe) void CFEManager::Close() { - if(have_locked) + if (have_locked) return; - for(fe_map_iterator_t it = femap.begin(); it != femap.end(); it++) { + for (fe_map_iterator_t it = femap.begin(); it != femap.end(); it++) { CFrontend * fe = it->second; if(!fe->Locked()) fe->Close(); + else + if (unlockFrontend(fe, true)) + fe->Close(); } } void CFEManager::Close(int _fe) { CFrontend * fe = getFE(_fe); - if(!fe->Locked()) + if (!fe->Locked()) fe->Close(); + else + if (unlockFrontend(fe, true)) + fe->Close(); } CFrontend * CFEManager::getFE(int index)