From ccfbe06ded3a2113bcd30b9da420ee765a5cd89b Mon Sep 17 00:00:00 2001 From: Tehom Date: Sat, 3 Jun 2017 21:57:11 -0400 Subject: [PATCH] Fix AttributeError when webserver isn't enabled. --- evennia/server/server.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/evennia/server/server.py b/evennia/server/server.py index 206fc54909..e1d120f4df 100644 --- a/evennia/server/server.py +++ b/evennia/server/server.py @@ -174,8 +174,11 @@ class Evennia(object): # (see https://github.com/evennia/evennia/issues/1128) def _wrap_sigint_handler(*args): from twisted.internet.defer import Deferred - d = self.web_root.empty_threadpool() - d.addCallback(lambda _: self.shutdown(_reactor_stopping=True)) + if WEBSERVER_ENABLED: + d = self.web_root.empty_threadpool() + d.addCallback(lambda _: self.shutdown(_reactor_stopping=True)) + else: + d = Deferred(lambda _: self.shutdown(_reactor_stopping=True)) d.addCallback(lambda _: reactor.stop()) reactor.callLater(1, d.callback, None) reactor.sigInt = _wrap_sigint_handler