From a10dc3b3fb0c7b395d079d6b827b437a4cae781b Mon Sep 17 00:00:00 2001
From: wimh <wimh@github>
Date: Thu, 27 Oct 2011 19:07:43 +0200
Subject: [PATCH] Revert "refs #18 fix handling of allow_passwordless_join
 setting"

This reverts commit 475c4b479e780d24bfc474b34c62420743daac6a.
---
 SparkleLib/SparkleListenerIrc.cs | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/SparkleLib/SparkleListenerIrc.cs b/SparkleLib/SparkleListenerIrc.cs
index 0f9d1472..7a998b38 100644
--- a/SparkleLib/SparkleListenerIrc.cs
+++ b/SparkleLib/SparkleListenerIrc.cs
@@ -49,8 +49,9 @@ namespace SparkleLib {
 
             // Option to allow access to channel when no password is defined
             try {
-                string option = SparkleConfig.DefaultConfig.GetConfigOption ("allow_passwordless_join");
-                this.allow_passwordless_join = option==null || Convert.ToBoolean (option);
+                this.allow_passwordless_join = Convert.ToBoolean (
+                    SparkleConfig.DefaultConfig.GetConfigOption ("allow_passwordless_join"));
+
             } catch (Exception) {
                 this.allow_passwordless_join = true;
             }
@@ -140,9 +141,6 @@ namespace SparkleLib {
 
                                 } else {
                                     SparkleHelpers.DebugInfo ("ListenerIrc", "Dangerous channel, change the setting to access");
-                                    base.is_connecting = false;
-                                    OnDisconnected ();
-                                    throw new ConnectionException ("Dangerous channel, change the setting to access");
                                 }
                             }