From 475d42e02f4449ca7a1bdeee07584f83799b32f2 Mon Sep 17 00:00:00 2001
From: OVSharova <olga.sharova@onlyoffice.com>
Date: Thu, 20 Jan 2022 19:17:18 +0300
Subject: [PATCH] Fix bug

---
 .../main/app/view/Animation.js                | 32 ++++++++++++-------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/apps/presentationeditor/main/app/view/Animation.js b/apps/presentationeditor/main/app/view/Animation.js
index e75b644de5..1e2b7e64e5 100644
--- a/apps/presentationeditor/main/app/view/Animation.js
+++ b/apps/presentationeditor/main/app/view/Animation.js
@@ -520,22 +520,32 @@ define([
                         }, this);
                         (effect.familyEffect) && this.btnParameters.menu.addItem({caption: '--'});
                     } else {
-                        this.btnParameters.menu.items.forEach(function (opt) {
-                            (opt.value == option) && (selectedElement = opt);
-                        });
+                        this.btnParameters.menu.items.forEach(function (opt,index) {
+                            if(index<arrEffectOptions.length && opt.value == option)
+                                selectedElement = opt;
+                        },this);
                     }
                     (selectedElement == undefined) && (selectedElement = this.btnParameters.menu.items[0])
                     selectedElement.setChecked(true);
                 }
-                if (effect.familyEffect &&  this._familyEffect != effect.familyEffect) {
-                    var effectsArray = Common.define.effectData.getSimilarEffectsArray(effectGroup, effect.familyEffect);
-                    effectsArray.forEach(function (opt) {
-                        opt.checkable = true;
-                        opt.toggleGroup = 'animatesimilareffects'
-                        this.btnParameters.menu.addItem(opt);
-                        (opt.value == effectId) && this.btnParameters.menu.items[this.btnParameters.menu.items.length - 1].setChecked();
-                    }, this);
+                if (effect.familyEffect){
+                    if (this._familyEffect != effect.familyEffect) {
+                        var effectsArray = Common.define.effectData.getSimilarEffectsArray(effectGroup, effect.familyEffect);
+                        effectsArray.forEach(function (opt) {
+                            opt.checkable = true;
+                            opt.toggleGroup = 'animatesimilareffects'
+                            this.btnParameters.menu.addItem(opt);
+                            (opt.value == effectId) && this.btnParameters.menu.items[this.btnParameters.menu.items.length - 1].setChecked();
+                        }, this);
+                    }
+                    else {
+                        this.btnParameters.menu.items.forEach(function (opt,index) {
+                            if(index>=arrEffectOptions.length && opt.value == effectId)
+                                opt.setChecked(true);
+                        });
+                    }
                 }
+
                 this._effectId = effectId;
                 this._groupName = effectGroup;
                 this._familyEffect = effect.familyEffect;