diff --git a/AssetStudioGUI/AboutForm.cs b/AssetStudioGUI/AboutForm.cs index 307a60e..1fb8ba0 100644 --- a/AssetStudioGUI/AboutForm.cs +++ b/AssetStudioGUI/AboutForm.cs @@ -10,13 +10,15 @@ namespace AssetStudioGUI public AboutForm() { InitializeComponent(); - var productName = Application.ProductName; var arch = Environment.Is64BitProcess ? "x64" : "x32"; + var appAssembly = typeof(Program).Assembly.GetName(); + var productName = appAssembly.Name; + var productVer = appAssembly.Version.ToString(); Text += " " + productName; productTitleLabel.Text = productName; - productVersionLabel.Text = $"v{Application.ProductVersion} [{arch}]"; + productVersionLabel.Text = $"v{productVer} [{arch}]"; productNamelabel.Text = productName; - modVersionLabel.Text = Application.ProductVersion; + modVersionLabel.Text = productVer; licenseRichTextBox.Text = GetLicenseText(); } diff --git a/AssetStudioGUI/AssetStudioGUIForm.cs b/AssetStudioGUI/AssetStudioGUIForm.cs index 4186eff..76d3c7e 100644 --- a/AssetStudioGUI/AssetStudioGUIForm.cs +++ b/AssetStudioGUI/AssetStudioGUIForm.cs @@ -112,11 +112,15 @@ namespace AssetStudioGUI [DllImport("gdi32.dll")] private static extern IntPtr AddFontMemResourceEx(IntPtr pbFont, uint cbFont, IntPtr pdv, [In] ref uint pcFonts); + private string guiTitle = string.Empty; + public AssetStudioGUIForm() { Thread.CurrentThread.CurrentCulture = new CultureInfo("en-US"); InitializeComponent(); - Text = $"{Application.ProductName} v{Application.ProductVersion}"; + var appAssembly = typeof(Program).Assembly.GetName(); + guiTitle = $"{appAssembly.Name} v{appAssembly.Version}"; + Text = guiTitle; delayTimer = new System.Timers.Timer(800); delayTimer.Elapsed += new ElapsedEventHandler(delayTimer_Elapsed); displayAll.Checked = Properties.Settings.Default.displayAll; @@ -223,11 +227,11 @@ namespace AssetStudioGUI if (!string.IsNullOrEmpty(productName)) { - Text = $"{Application.ProductName} v{Application.ProductVersion} - {productName} - {assetsManager.assetsFileList[0].unityVersion} - {assetsManager.assetsFileList[0].m_TargetPlatform}"; + Text = $"{guiTitle} - {productName} - {assetsManager.assetsFileList[0].unityVersion} - {assetsManager.assetsFileList[0].m_TargetPlatform}"; } else { - Text = $"{Application.ProductName} v{Application.ProductVersion} - no productName - {assetsManager.assetsFileList[0].unityVersion} - {assetsManager.assetsFileList[0].m_TargetPlatform}"; + Text = $"{guiTitle} - no productName - {assetsManager.assetsFileList[0].unityVersion} - {assetsManager.assetsFileList[0].m_TargetPlatform}"; } assetListView.VirtualListSize = visibleAssets.Count; @@ -1340,7 +1344,7 @@ namespace AssetStudioGUI private void ResetForm() { - Text = $"{Application.ProductName} v{Application.ProductVersion}"; + Text = guiTitle; assetsManager.Clear(); assemblyLoader.Clear(); exportableAssets.Clear();