From 5e65325772ec427c0114dee29043d5cd78131cbc Mon Sep 17 00:00:00 2001
From: isanae <14251494+isanae@users.noreply.github.com>
Date: Sun, 9 Jun 2019 11:43:20 -0400
Subject: fixed plugin executables not overriding if the custom attribute was
 inadvertently set

---
 src/executableslist.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/executableslist.cpp')

diff --git a/src/executableslist.cpp b/src/executableslist.cpp
index f592a2b7..0283a845 100644
--- a/src/executableslist.cpp
+++ b/src/executableslist.cpp
@@ -312,11 +312,11 @@ bool Executable::usesOwnIcon() const
 
 void Executable::mergeFrom(const Executable& other)
 {
-  // flags on plugin executables that the user is allowed to chnage
+  // flags on plugin executables that the user is allowed to change
   const auto allow = ShowInToolbar;
 
 
-  if (!isCustom() && !other.isCustom()) {
+  if (!other.isCustom()) {
     // this happens when loading plugin executables in addFromPlugin(), replace
     // everything in case the plugin has changed
 
-- 
cgit v1.3.1