diff --git a/NovetusLauncher/NovetusCMD/Program.cs b/NovetusLauncher/NovetusCMD/Program.cs index 92527eb..6efd98b 100644 --- a/NovetusLauncher/NovetusCMD/Program.cs +++ b/NovetusLauncher/NovetusCMD/Program.cs @@ -189,7 +189,6 @@ namespace NovetusCMD public static void Main(string[] args) { - GlobalVars.PublicIP = SecurityFuncs.GetExternalIPAddress(); string[] lines = File.ReadAllLines(GlobalVars.ConfigDir + "\\info.txt"); //File is in System.IO string version = lines[0]; GlobalVars.DefaultClient = lines[1]; @@ -414,11 +413,11 @@ namespace NovetusCMD Environment.Exit(0); } - static void CreateTXT() + static async void CreateTXT() { if (LocalVars.RequestToOutputInfo) { - string IP = GlobalVars.PublicIP; + string IP = await SecurityFuncs.GetExternalIPAddressAsync(); string[] lines1 = { SecurityFuncs.Base64Encode(IP), SecurityFuncs.Base64Encode(GlobalVars.RobloxPort.ToString()), diff --git a/NovetusLauncher/NovetusFuncs/GlobalVars.cs b/NovetusLauncher/NovetusFuncs/GlobalVars.cs index 161fcb7..5325b3c 100644 --- a/NovetusLauncher/NovetusFuncs/GlobalVars.cs +++ b/NovetusLauncher/NovetusFuncs/GlobalVars.cs @@ -130,7 +130,6 @@ public static class GlobalVars public static AssetCacheDef ItemPantsTexture { get { return new AssetCacheDef("Pants", new string[] { "PantsTemplate" }, new string[] { ".png" }, new string[] { pantsdirTextures }, new string[] { pantsGameDirTextures }); } } public static string IP = "localhost"; - public static string PublicIP = ""; public static string Version = ""; public static string SharedArgs = ""; public static readonly string ScriptName = "CSMPFunctions"; diff --git a/NovetusLauncher/NovetusFuncs/SecurityFuncs.cs b/NovetusLauncher/NovetusFuncs/SecurityFuncs.cs index 8de7d2e..6260414 100644 --- a/NovetusLauncher/NovetusFuncs/SecurityFuncs.cs +++ b/NovetusLauncher/NovetusFuncs/SecurityFuncs.cs @@ -19,6 +19,7 @@ using System.Security.Principal; using System.Linq; using System.ComponentModel; using System.Net; +using System.Threading.Tasks; /// /// Description of SecurityFuncs. @@ -206,4 +207,10 @@ public class SecurityFuncs return ipAddress; } + + public static async Task GetExternalIPAddressAsync() + { + var task = Task.Run(() => GetExternalIPAddress()); + return await task; + } } \ No newline at end of file diff --git a/NovetusLauncher/NovetusLauncher/MainForm.cs b/NovetusLauncher/NovetusLauncher/MainForm.cs index e5f868c..92c81f0 100644 --- a/NovetusLauncher/NovetusLauncher/MainForm.cs +++ b/NovetusLauncher/NovetusLauncher/MainForm.cs @@ -206,12 +206,12 @@ namespace NovetusLauncher ConsolePrint("WebServer: Failed to stop WebServer. Some features may not function. (Did not run as Administrator)", 2); } } - - void tabControl1_SelectedIndexChanged(object sender, EventArgs e) + + async void tabControl1_SelectedIndexChanged(object sender, EventArgs e) { if (tabControl1.SelectedTab == tabControl1.TabPages["tabPage2"])//your specific tabname { - string IP = GlobalVars.PublicIP; + string IP = await SecurityFuncs.GetExternalIPAddressAsync(); string[] lines1 = { SecurityFuncs.Base64Encode(IP), SecurityFuncs.Base64Encode(GlobalVars.RobloxPort.ToString()), @@ -249,6 +249,8 @@ namespace NovetusLauncher textBox3.AppendText(Environment.NewLine); } } + textBox3.SelectionStart = 0; + textBox3.ScrollToCaret(); treeView1.Nodes.Clear(); _fieldsTreeCache.Nodes.Clear(); textBox4.Text = ""; @@ -355,7 +357,6 @@ namespace NovetusLauncher void MainFormLoad(object sender, EventArgs e) { - GlobalVars.PublicIP = SecurityFuncs.GetExternalIPAddress(); string[] lines = File.ReadAllLines(GlobalVars.ConfigDir + "\\info.txt"); //File is in System.IO string version = lines[0]; GlobalVars.DefaultClient = lines[1];