From 5d3f5eed90afd8c2a23065b5f2806fd247fd1426 Mon Sep 17 00:00:00 2001 From: Lucas Nicodemus Date: Wed, 21 Dec 2011 13:09:28 -0700 Subject: [PATCH] GeoIP dispose fix --- TShockAPI/Properties/AssemblyInfo.cs | 4 ++-- TShockAPI/TShock.cs | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/TShockAPI/Properties/AssemblyInfo.cs b/TShockAPI/Properties/AssemblyInfo.cs index 0a86b8f4..214e8c8d 100644 --- a/TShockAPI/Properties/AssemblyInfo.cs +++ b/TShockAPI/Properties/AssemblyInfo.cs @@ -36,5 +36,5 @@ using System.Runtime.InteropServices; // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("3.4.0.1221")] -[assembly: AssemblyFileVersion("3.4.0.1221")] +[assembly: AssemblyVersion("3.4.1.1221")] +[assembly: AssemblyFileVersion("3.4.1.1221")] diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs index c25ea3ed..ff7a6eda 100644 --- a/TShockAPI/TShock.cs +++ b/TShockAPI/TShock.cs @@ -295,7 +295,10 @@ namespace TShockAPI { if (disposing) { - Geo.Dispose(); + if (Geo != null) + { + Geo.Dispose(); + } GameHooks.PostInitialize -= OnPostInit; GameHooks.Update -= OnUpdate; ServerHooks.Join -= OnJoin;