From 5da1cbd0969ee1fa75a359937cc93976741fe694 Mon Sep 17 00:00:00 2001 From: Michael Friedrich Date: Tue, 19 Feb 2019 14:30:44 +0100 Subject: [PATCH] Revert "Respect activation priority also on deactivation" This reverts commit 8ad1717055683c573f81181c7749ba422fa96d13. --- lib/base/configobject.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/base/configobject.cpp b/lib/base/configobject.cpp index f8517d61d..b73285bc5 100644 --- a/lib/base/configobject.cpp +++ b/lib/base/configobject.cpp @@ -33,7 +33,6 @@ #include "base/workqueue.hpp" #include "base/context.hpp" #include "base/application.hpp" -#include #include #include #include @@ -618,13 +617,7 @@ void ConfigObject::RestoreObjects(const String& filename, int attributeTypes) void ConfigObject::StopObjects() { - auto types = Type::GetAllTypes(); - - std::sort(types.begin(), types.end(), [](const Type::Ptr& a, const Type::Ptr& b) { - return a->GetActivationPriority() > b->GetActivationPriority(); - }); - - for (const Type::Ptr& type : types) { + for (const Type::Ptr& type : Type::GetAllTypes()) { auto *dtype = dynamic_cast(type.get()); if (!dtype)