Fixed issue #125

ShikyoKira · Jan 11, 2020 · 11c4535 · 11c4535
1 parent aa04180
commit 11c4535
Showing 1 changed file with 18 additions and 18 deletions.
diff --git a/add animation/nodejoint.cpp b/add animation/nodejoint.cpp
@@ -1316,24 +1316,6 @@ void processing2(string& line, string format, string filename, int& nextFunction
 							}
 						}
 
-						pos = change.find("{main_anim_event}", 0);
-
-						if (pos != NOT_FOUND)
-						{
-							change.replace(pos, 17, subFunctionIDs->grouplist[groupMulti]->singlelist[animMulti]->format["main_anim_event"]);
-							isChange = true;
-						}
-						else
-						{
-							pos = change.find("main_anim_event", 0);
-
-							if (pos != NOT_FOUND)
-							{
-								change.replace(pos, 15, subFunctionIDs->grouplist[groupMulti]->singlelist[animMulti]->format["main_anim_event"]);
-								isChange = true;
-							}
-						}
-
 						if (error) throw nemesis::exception();
 					}
 
@@ -1390,6 +1372,24 @@ void processing2(string& line, string format, string filename, int& nextFunction
 					string tempchange = change;
 					pos = change.find("[");
 
+					pos = change.find("{main_anim_event}", 0);
+
+					if (pos != NOT_FOUND)
+					{
+						change.replace(pos, 17, subFunctionIDs->grouplist[groupMulti]->singlelist[animMulti]->format["main_anim_event"]);
+						isChange = true;
+					}
+					else
+					{
+						pos = change.find("main_anim_event", 0);
+
+						if (pos != NOT_FOUND)
+						{
+							change.replace(pos, 15, subFunctionIDs->grouplist[groupMulti]->singlelist[animMulti]->format["main_anim_event"]);
+							isChange = true;
+						}
+					}
+
 					if (pos != NOT_FOUND && change.find("]", pos) != NOT_FOUND)
 					{
 						formatGroupReplace(change, change, 0, filename, format, subFunctionIDs, groupAnimInfo, linecount, groupMulti, optionMulti, animMulti, multiOption, innerError);