Revert "refs #18 fix handling of allow_passwordless_join setting"
This reverts commit 475c4b479e
.
This commit is contained in:
parent
b1d460cd40
commit
a10dc3b3fb
|
@ -49,8 +49,9 @@ namespace SparkleLib {
|
||||||
|
|
||||||
// Option to allow access to channel when no password is defined
|
// Option to allow access to channel when no password is defined
|
||||||
try {
|
try {
|
||||||
string option = SparkleConfig.DefaultConfig.GetConfigOption ("allow_passwordless_join");
|
this.allow_passwordless_join = Convert.ToBoolean (
|
||||||
this.allow_passwordless_join = option==null || Convert.ToBoolean (option);
|
SparkleConfig.DefaultConfig.GetConfigOption ("allow_passwordless_join"));
|
||||||
|
|
||||||
} catch (Exception) {
|
} catch (Exception) {
|
||||||
this.allow_passwordless_join = true;
|
this.allow_passwordless_join = true;
|
||||||
}
|
}
|
||||||
|
@ -140,9 +141,6 @@ namespace SparkleLib {
|
||||||
|
|
||||||
} else {
|
} else {
|
||||||
SparkleHelpers.DebugInfo ("ListenerIrc", "Dangerous channel, change the setting to access");
|
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");
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue