Fix accidental palette interactions

musescore · Oct 16, 2022 · d9f5fc8 · d9f5fc8
1 parent 7a80182
commit d9f5fc8
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/src/engraving/libmscore/accidental.cpp b/src/engraving/libmscore/accidental.cpp
@@ -22,6 +22,9 @@
 
 #include "accidental.h"
 
+#include "editdata.h"
+#include "engravingitem.h"
+#include "engravingobject.h"
 #include "infrastructure/symbolfont.h"
 #include "rw/xml.h"
 #include "types/symnames.h"
@@ -542,6 +545,10 @@ bool Accidental::acceptDrop(EditData& data) const
 {
     EngravingItem* e = data.dropElement;
 
+    if (e->type() == ElementType::ACCIDENTAL) {
+        return true;
+    }
+
     if (e->isActionIcon()) {
         ActionIconType type = toActionIcon(e)->actionType();
         return type == ActionIconType::PARENTHESES
@@ -559,6 +566,9 @@ EngravingItem* Accidental::drop(EditData& data)
 {
     EngravingItem* e = data.dropElement;
     switch (e->type()) {
+    case ElementType::ACCIDENTAL:
+        score()->changeAccidental(toAccidental(e)->accidentalType());
+        break;
     case ElementType::ACTION_ICON:
         switch (toActionIcon(e)->actionType()) {
         case ActionIconType::PARENTHESES:
@@ -575,7 +585,7 @@ EngravingItem* Accidental::drop(EditData& data)
     default:
         break;
     }
-    delete e;
+    // delete e;
     return nullptr;
 }