From d74c0b15331a38da0db09d270de40bbcf3d548ee Mon Sep 17 00:00:00 2001 From: Ahmad Samir Date: Thu, 19 Nov 2020 18:02:39 +0200 Subject: [PATCH] Fix if condition when updating filters We want to delete the _escapedUrlFilter if allowEscapedLinks() is false. --- src/session/SessionController.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/session/SessionController.cpp b/src/session/SessionController.cpp index d8d086684..8060c372d 100644 --- a/src/session/SessionController.cpp +++ b/src/session/SessionController.cpp @@ -1304,14 +1304,15 @@ void SessionController::updateFilterList(const Profile::Ptr &profile) filterChain->addFilter(_urlFilter); } - const bool allowEscapeSequenceLinks = profile->allowEscapedLinks(); - if (allowEscapeSequenceLinks && (_escapedUrlFilter != nullptr)) { + if (profile->allowEscapedLinks()) { + if (_escapedUrlFilter == nullptr) { + _escapedUrlFilter = new EscapeSequenceUrlFilter(_sessionDisplayConnection->session(), _sessionDisplayConnection->view()); + filterChain->addFilter(_escapedUrlFilter); + } + } else if (_escapedUrlFilter != nullptr) { // Became disabled, clean up filterChain->removeFilter(_escapedUrlFilter); delete _escapedUrlFilter; _escapedUrlFilter = nullptr; - } else if (allowEscapeSequenceLinks && _escapedUrlFilter == nullptr) { - _escapedUrlFilter = new EscapeSequenceUrlFilter(_sessionDisplayConnection->session(), _sessionDisplayConnection->view()); - filterChain->addFilter(_escapedUrlFilter); } const bool allowColorFilters = profile->colorFilterEnabled();