adjust deactivate logic
Merge branch 'master' of https://github.com/H5xxx/mocar