Merge branch 'master' of https://github.com/topameng/tolua

topameng · Aug 9, 2019 · 796160f · 796160f
2 parents d028174 + 2181e61
commit 796160f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/Assets/ToLua/Core/ToLua.cs b/Assets/ToLua/Core/ToLua.cs
@@ -574,7 +574,11 @@ public static bool OnOpenAsset(int instanceID, int line)
                         if (path.EndsWith(fileName) || path.EndsWith(fileName + ".bytes"))
                         {
                             UnityEngine.Object obj = AssetDatabase.LoadMainAssetAtPath(path);
-                            AssetDatabase.OpenAsset(obj, line);
+                            if (Application.isPlaying) {
+                                EditorApplication.delayCall = delegate(){ AssetDatabase.OpenAsset(obj, line); };
+                            } else {
+                                AssetDatabase.OpenAsset(obj, line);
+                            }
                             return true;
                         }
                     }