Merge PR407

closes #407
This commit is contained in:
Brian Warner 2017-04-10 11:37:18 -07:00
commit 0599adf87b

View File

@ -108,7 +108,7 @@ class MagicFolder(service.MultiService):
return self.uploader.start_monitoring()
def stopService(self):
return self.finish()
return defer.gatherResults([service.MultiService.stopService(self), self.finish()])
def ready(self):
"""ready is used to signal us to start