fix nullpo when motdurl is null (TorchAPI#195)

* fix nullpo when motdurl is null * prolly better
dorimanx · Sep 9, 2021 · 6be14d7 · 6be14d7
1 parent d045c3c
commit 6be14d7
Showing 1 changed file with 10 additions and 6 deletions.
diff --git a/Essentials/EssentialsPlugin.cs b/Essentials/EssentialsPlugin.cs
@@ -278,13 +278,10 @@ public void SendMotd(MyPlayer player, bool onSessionChanged)
         {
             long playerId = player.Identity.IdentityId;
 
-            var motdUrl = MyGuiSandbox.IsUrlWhitelisted(Config.MotdUrl)
-                ? Config.MotdUrl
-                : $"https://steamcommunity.com/linkfilter/?url={Config.MotdUrl}";
-
             if (!string.IsNullOrEmpty(Config.MotdUrl) && !Config.NewUserMotdUrl)
             {
-                MyVisualScriptLogicProvider.OpenSteamOverlay(motdUrl, playerId);
+                var url = MakeUrl(Config.MotdUrl);
+                MyVisualScriptLogicProvider.OpenSteamOverlay(url, playerId);
                 return;
             }
 
@@ -301,7 +298,8 @@ public void SendMotd(MyPlayer player, bool onSessionChanged)
 
             if (!string.IsNullOrEmpty(Config.MotdUrl) && isNewUser && Config.NewUserMotdUrl)
             {
-                MyVisualScriptLogicProvider.OpenSteamOverlay(motdUrl, playerId);
+                var url = MakeUrl(Config.MotdUrl);
+                MyVisualScriptLogicProvider.OpenSteamOverlay(url, playerId);
                 return;
             }
 
@@ -327,6 +325,12 @@ public void SendMotd(MyPlayer player, bool onSessionChanged)
             }
         }
 
+        static string MakeUrl(string url)
+        {
+            if (MyGuiSandbox.IsUrlWhitelisted(url)) return url;
+            return $"https://steamcommunity.com/linkfilter/?url={url}";
+        }
+
         static string GetDefaultMotdText()
         {
             try