From 82ea0896838dbf930f5d9c3631627f6285fd6141 Mon Sep 17 00:00:00 2001
From: sta <sta.blockhead@gmail.com>
Date: Tue, 12 Apr 2016 13:44:52 +0900
Subject: [PATCH] [Modify] Polish it

---
 websocket-sharp/Net/HttpListener.cs | 28 +++++++++-------------------
 1 file changed, 9 insertions(+), 19 deletions(-)

diff --git a/websocket-sharp/Net/HttpListener.cs b/websocket-sharp/Net/HttpListener.cs
index 92c1c4d1..abb3e344 100644
--- a/websocket-sharp/Net/HttpListener.cs
+++ b/websocket-sharp/Net/HttpListener.cs
@@ -454,7 +454,10 @@ namespace WebSocketSharp.Net
 
     private void close (bool force)
     {
-      EndPointManager.RemoveListener (this);
+      if (_listening) {
+        _listening = false;
+        EndPointManager.RemoveListener (this);
+      }
 
       lock (_ctxRegistrySync) {
         if (!force)
@@ -464,6 +467,8 @@ namespace WebSocketSharp.Net
       cleanupContextRegistry ();
       cleanupConnections ();
       cleanupWaitQueue (new ObjectDisposedException (GetType ().ToString ()));
+
+      _disposed = true;
     }
 
     private HttpListenerContext getContextFromQueue ()
@@ -648,12 +653,7 @@ namespace WebSocketSharp.Net
       if (_disposed)
         return;
 
-      if (_listening) {
-        _listening = false;
-        close (true);
-      }
-
-      _disposed = true;
+      close (true);
     }
 
     /// <summary>
@@ -701,12 +701,7 @@ namespace WebSocketSharp.Net
       if (_disposed)
         return;
 
-      if (_listening) {
-        _listening = false;
-        close (false);
-      }
-
-      _disposed = true;
+      close (false);
     }
 
     /// <summary>
@@ -836,12 +831,7 @@ namespace WebSocketSharp.Net
       if (_disposed)
         return;
 
-      if (_listening) {
-        _listening = false;
-        close (true);
-      }
-
-      _disposed = true;
+      close (true);
     }
 
     #endregion