Fixed wrong merge for WelcomeWindow

4thlabs · 4thlabs · commit fd44b4123610 · 2023-06-14T11:03:01.000+02:00
diff --git a/Editor/WelcomeWindow.cs b/Editor/WelcomeWindow.cs
@@ -38,6 +38,11 @@ private static void InitializeOnLoad()
             }
         }
 
+        public static void Initialize()
+        {
+            GetWindow<WelcomeWindow>("Welcome!");
+        }
+
         void OnEnable()
         {
             _logoTex = (Texture2D) AssetDatabase.LoadAssetAtPath("Packages/dolbyio.comms.unity/Editor/Resources/dolby.io-logo.png", typeof(Texture2D));

Original file line number	Diff line number	Diff line change
`@@ -38,6 +38,11 @@ private static void InitializeOnLoad()`
`38`	`38`	`}`
`39`	`39`	`}`
`40`	`40`
	`41`	`+ public static void Initialize()`
	`42`	`+ {`
	`43`	`+ GetWindow<WelcomeWindow>("Welcome!");`
	`44`	`+ }`
	`45`	`+`
`41`	`46`	`void OnEnable()`
`42`	`47`	`{`
`43`	`48`	`_logoTex = (Texture2D) AssetDatabase.LoadAssetAtPath("Packages/dolbyio.comms.unity/Editor/Resources/dolby.io-logo.png", typeof(Texture2D));`