Merge pull request #70 from ghost/Buginit-config-channel-1
Fixed ignoring channel in config file.
This commit is contained in:
commit
951934602e
@ -74,7 +74,6 @@ class MumbleBot:
|
|||||||
|
|
||||||
self.volume = self.volume_set
|
self.volume = self.volume_set
|
||||||
|
|
||||||
self.channel = args.channel
|
|
||||||
|
|
||||||
root = logging.getLogger()
|
root = logging.getLogger()
|
||||||
formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
|
formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
|
||||||
@ -135,6 +134,11 @@ class MumbleBot:
|
|||||||
else:
|
else:
|
||||||
password = var.config.get("server", "password")
|
password = var.config.get("server", "password")
|
||||||
|
|
||||||
|
if args.channel:
|
||||||
|
self.channel = args.channel
|
||||||
|
else:
|
||||||
|
self.channel = var.config.get("server", "channel")
|
||||||
|
|
||||||
if args.certificate:
|
if args.certificate:
|
||||||
certificate = args.certificate
|
certificate = args.certificate
|
||||||
else:
|
else:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user