Added null checks and lowered timeout if assets are disabled.

Author: chaoscode

WindowsFormsApplication6/Form1.cs

@@ -9,7 +9,6 @@
 using System.Net.WebSockets;
 using System.Threading;
 using System.IO;
-using Newtonsoft.Json;
 using System.Net;
 
 namespace WindowsFormsApplication6

WindowsFormsApplication6/Form1.resx

@@ -120,6 +120,9 @@
   <metadata name="fileSystemWatcher1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>39</value>
+  </metadata>
   <metadata name="menuStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>176, 17</value>
   </metadata>

WindowsFormsApplication6/Managers/HelperClass.cs

@@ -115,7 +115,7 @@ public string GetFile(string ServerName, string ServerPort, string filepath, str
 
                 webRequest.AutomaticDecompression = DecompressionMethods.Deflate | DecompressionMethods.GZip;
                 webRequest.AllowWriteStreamBuffering = true;
-                webRequest.Timeout = 30000;
+                webRequest.Timeout = 1000;
                 webRequest.Referer = GetFakeReferer(ServerName, ServerPort);
                 webRequest.Headers.Add("sid", sid);
 

WindowsFormsApplication6/Managers/MapManager.cs

@@ -77,41 +77,44 @@ public PictureBox DrawMonuments(string ServerName, string ServerPort, List<Model
 
             HelperClass HelpMgr = new HelperClass();
 
-            OutPut.AppendText(Environment.NewLine + "Total World Monumnets:" + Monumentlst.Count.ToString());
+            if (Monumentlst != null)
+                { 
+                    OutPut.AppendText(Environment.NewLine + "Total World Monumnets:" + Monumentlst.Count.ToString());
 
-            foreach (Models.world.Monument Monument in Monumentlst)
-            {
+                    foreach (Models.world.Monument Monument in Monumentlst)
+                    {
 
-                // Output the load of image
-                OutPut.AppendText(Environment.NewLine + "Attempting to draw [" + Monument.name + "]: " + Monument.displayName);
+                        // Output the load of image
+                        OutPut.AppendText(Environment.NewLine + "Attempting to draw [" + Monument.name + "]: " + Monument.displayName);
 
-                string ImgPath = BuildMonumentsImagePath(Monument);
-                Image ObjectImg = null;
+                        string ImgPath = BuildMonumentsImagePath(Monument);
+                        Image ObjectImg = null;
 
-                // Check if image is cached
-                if (File.Exists("." + ImgPath))
-                {
-                    // Load file from cache
-                    ObjectImg = Image.FromFile("." + ImgPath);
-                } else
-                {
+                        // Check if image is cached
+                        if (File.Exists("." + ImgPath))
+                        {
+                            // Load file from cache
+                            ObjectImg = Image.FromFile("." + ImgPath);
+                        } else
+                        {
 
-                    // Try to get image for object
-                    ObjectImg = GetImage(RustIOServer, "80", BuildMonumentsImagePath(Monument));
+                            // Try to get image for object
+                            ObjectImg = GetImage(RustIOServer, "80", BuildMonumentsImagePath(Monument));
 
-                    // Cache Image
-                    ObjectImg.Save("." + ImgPath);
-                }
+                            // Cache Image
+                            ObjectImg.Save("." + ImgPath);
+                        }
 
-                // Make sure its not null
-                if (ObjectImg != null)
-                {
+                        // Make sure its not null
+                        if (ObjectImg != null)
+                        {
 
-                    // Draw Monuments
-                    MapImg = DrawMonument(Monument, ObjectImg, MapImg, ServerStatus);
-                }
+                            // Draw Monuments
+                            MapImg = DrawMonument(Monument, ObjectImg, MapImg, ServerStatus);
+                        }
 
-            }
+                    }
+                }
 
             return MapImg;
         }

WindowsFormsApplication6/WindowsFormsApplication6.csproj

@@ -55,7 +55,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
-      <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <HintPath>..\packages\Newtonsoft.Json.12.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="SteamKit2">
       <HintPath>..\packages\SteamKit2\SteamKit2.dll</HintPath>

WindowsFormsApplication6/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net472" />
+  <package id="Newtonsoft.Json" version="12.0.3" targetFramework="net472" />
 </packages>