From dc4d0416a27e33aa43899ffd6b15b372c0345dbd Mon Sep 17 00:00:00 2001
From: Stefan Zermatten <stefanzermatten@gmail.com>
Date: Tue, 22 Feb 2022 19:07:40 +0200
Subject: [PATCH] Fixed spells disabled by toggles still appearing in spell
 lists

---
 .../ui/creature/character/characterSheetTabs/SpellsTab.vue      | 1 +
 app/imports/ui/properties/components/spells/SpellListCard.vue   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/app/imports/ui/creature/character/characterSheetTabs/SpellsTab.vue b/app/imports/ui/creature/character/characterSheetTabs/SpellsTab.vue
index 6a105aa2..ad87c9f5 100644
--- a/app/imports/ui/creature/character/characterSheetTabs/SpellsTab.vue
+++ b/app/imports/ui/creature/character/characterSheetTabs/SpellsTab.vue
@@ -63,6 +63,7 @@ export default {
         type: 'spell',
         removed: {$ne: true},
         deactivatedByAncestor: {$ne: true},
+        deactivatedByToggle: {$ne: true},
       }, {
         sort: {
           level: 1,
diff --git a/app/imports/ui/properties/components/spells/SpellListCard.vue b/app/imports/ui/properties/components/spells/SpellListCard.vue
index 2077788a..c45c7cc3 100644
--- a/app/imports/ui/properties/components/spells/SpellListCard.vue
+++ b/app/imports/ui/properties/components/spells/SpellListCard.vue
@@ -86,6 +86,7 @@ export default {
       };
       if (this.preparingSpells){
         filter.deactivatedByAncestor = {$ne: true};
+        filter.deactivatedByToggle = {$ne: true};
       } else {
         filter.inactive = {$ne: true};
       }
@@ -104,6 +105,7 @@ export default {
         prepared: true,
         alwaysPrepared: {$ne: true},
         deactivatedByAncestor: {$ne: true},
+        deactivatedByToggle: {$ne: true},
       }).count();
     },
     preparedError(){