Merge branch 'beta-bugs' of github.com:Autodesk/synthesis into beta-bugs

Author: LucaHaverty

engine/Assets/Scripts/ModuleLoader/Api.cs

@@ -43,8 +43,12 @@ public class Api : MonoBehaviour {
 
         public void Start() // Must happen after ResourceLedger is initialized (in Awake)
         {
-            if (Instance == null)
+            if (Instance == null) {
                 Instance = this;
+            } else {
+                Destroy(gameObject);
+                return;
+            }
 
             SetupApplication(); // Always do this first
 
@@ -103,6 +107,10 @@ private void SetupApplication() {
             // PanelScaler.ScaleMode.ConstantPhysicalSize;
         }
 
+        private void OnDestroy() {
+            Instance = null;
+        }
+
         private class LoggerImpl : SynthesisAPI.Utilities.ILogger {
             private bool debugLogsEnabled = true;
             private bool _isEnabled       = true;

engine/Assets/Scripts/UI/MainMenu/LinksTween.cs

@@ -21,9 +21,10 @@ public class LinksTween : MonoBehaviour, IPointerEnterHandler, IPointerExitHandl
     public void OnPointerEnter(PointerEventData eventData) {
         text      = gameObject.GetComponent<TMP_Text>();
         sizeStart = text.fontSize;
-        SynthesisTween.MakeTween(_growKey, text.fontSize, sizeEnd, 1f,
-            (t, a, b) => SynthesisTweenInterpolationFunctions.FloatInterp(t, (float) a, (float) b),
-            SynthesisTweenScaleFunctions.EaseOutCubic, TweenUp);
+        if (!SynthesisTween.TweenExists(_growKey))
+            SynthesisTween.MakeTween(_growKey, text.fontSize, sizeEnd, 1f,
+                (t, a, b) => SynthesisTweenInterpolationFunctions.FloatInterp(t, (float) a, (float) b),
+                SynthesisTweenScaleFunctions.EaseOutCubic, TweenUp);
     }
 
     public void OnPointerExit(PointerEventData eventData) {

engine/Assets/Scripts/Utilities/Tween/SynthesisTween.cs

@@ -69,6 +69,10 @@ public SynthesisTweenStatus(object val, float prog) {
             CurrentProgress = prog;
         }
     }
+
+    public static Boolean TweenExists(string key) {
+        return _tweens.ContainsKey(key);
+    }
 }
 
 public static class SynthesisTweenScaleFunctions {