Merge branch 'master' into bleed

This commit is contained in:
chrys
2018-05-14 21:26:33 +02:00
9 changed files with 151 additions and 60 deletions

View File

@ -153,7 +153,10 @@ class settingsManager():
def shutdownDriver(self, driverType):
if self.env['runtime'][driverType] == None:
return
self.env['runtime'][driverType].shutdown()
try:
self.env['runtime'][driverType].shutdown()
except Exception as e:
pass
del self.env['runtime'][driverType]
def setFenrirKeys(self, keys):