Commit 46a601f7 authored by nanahira's avatar nanahira

Merge branch 'master' into tcg_random

parents fb1b0d7c 7543da80
...@@ -3263,6 +3263,7 @@ spawn_windbot = () -> ...@@ -3263,6 +3263,7 @@ spawn_windbot = () ->
windbot_process.stderr.on 'data', (data)-> windbot_process.stderr.on 'data', (data)->
log.warn 'WindBot Error:', data log.warn 'WindBot Error:', data
return return
return
if settings.modules.windbot.enabled and settings.modules.windbot.spawn if settings.modules.windbot.enabled and settings.modules.windbot.spawn
spawn_windbot() spawn_windbot()
......
...@@ -4173,7 +4173,7 @@ ...@@ -4173,7 +4173,7 @@
log.info('WindBot:', data); log.info('WindBot:', data);
}); });
windbot_process.stderr.setEncoding('utf8'); windbot_process.stderr.setEncoding('utf8');
return windbot_process.stderr.on('data', function(data) { windbot_process.stderr.on('data', function(data) {
log.warn('WindBot Error:', data); log.warn('WindBot Error:', data);
}); });
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment