diff options
| author | isanae <14251494+isanae@users.noreply.github.com> | 2019-06-09 11:43:20 -0400 |
|---|---|---|
| committer | isanae <14251494+isanae@users.noreply.github.com> | 2019-06-15 14:40:40 -0400 |
| commit | 5e65325772ec427c0114dee29043d5cd78131cbc (patch) | |
| tree | 7d1e53a441ba51ac19d2d3ed0404476e3da1ae20 /src/executableslist.cpp | |
| parent | e86224ee7ffdb18b7c7d17bc2c5cef2457665103 (diff) | |
fixed plugin executables not overriding if the custom attribute was inadvertently set
Diffstat (limited to 'src/executableslist.cpp')
| -rw-r--r-- | src/executableslist.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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
|