From f58b099f1691d47279cfe693bfce79b03003a438 Mon Sep 17 00:00:00 2001
From: sta <sta.blockhead@gmail.com>
Date: Sat, 22 Aug 2020 22:09:10 +0900
Subject: [PATCH] [Modify] Polish it

---
 websocket-sharp/Net/HttpListenerPrefixCollection.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/websocket-sharp/Net/HttpListenerPrefixCollection.cs b/websocket-sharp/Net/HttpListenerPrefixCollection.cs
index 9339c0da..ecc71bcd 100644
--- a/websocket-sharp/Net/HttpListenerPrefixCollection.cs
+++ b/websocket-sharp/Net/HttpListenerPrefixCollection.cs
@@ -272,12 +272,19 @@ namespace WebSocketSharp.Net
     public bool Remove (string uriPrefix)
     {
       _listener.CheckDisposed ();
+
       if (uriPrefix == null)
         throw new ArgumentNullException ("uriPrefix");
 
       var ret = _prefixes.Remove (uriPrefix);
-      if (ret && _listener.IsListening)
-        EndPointManager.RemovePrefix (uriPrefix, _listener);
+
+      if (!ret)
+        return ret;
+
+      if (!_listener.IsListening)
+        return ret;
+
+      EndPointManager.RemovePrefix (uriPrefix, _listener);
 
       return ret;
     }