From aa280edbde0e4cce207844f97eac3782fe2d3e1a Mon Sep 17 00:00:00 2001 From: wmayer Date: Sun, 4 Nov 2018 11:54:40 +0100 Subject: [PATCH 3/3] fix blocking of SelectionObserver --- src/Gui/Selection.cpp | 10 +++++----- src/Gui/Selection.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/Gui/Selection.cpp b/src/Gui/Selection.cpp index 80b7e3056..52976e6a0 100644 --- a/src/Gui/Selection.cpp +++ b/src/Gui/Selection.cpp @@ -53,7 +53,7 @@ using namespace Gui; using namespace std; -SelectionObserver::SelectionObserver() : blocker(connectSelection, false) +SelectionObserver::SelectionObserver() : blockSelection(false) { attachSelection(); } @@ -65,17 +65,17 @@ SelectionObserver::~SelectionObserver() bool SelectionObserver::blockConnection(bool block) { - bool ok = connectSelection.blocked(); + bool ok = blockSelection; if (block) - blocker.block(); + blockSelection = true; else - blocker.unblock(); + blockSelection = false; return ok; } bool SelectionObserver::isConnectionBlocked() const { - return connectSelection.blocked(); + return blockSelection; } void SelectionObserver::attachSelection() diff --git a/src/Gui/Selection.h b/src/Gui/Selection.h index e1c195989..5e3144e16 100644 --- a/src/Gui/Selection.h +++ b/src/Gui/Selection.h @@ -146,7 +146,7 @@ private: private: typedef boost::signals2::connection Connection; Connection connectSelection; - boost::signals2::shared_connection_block blocker; + bool blockSelection; }; /** -- 2.21.0