Merge branch 'master' into v2.2.0b1

# Conflicts: # eve.db
2018-06-12 21:41:04 -04:00
parent 3ebfe045c5 d4d55c026a
commit e19d231eba
13 changed files with 45 additions and 39 deletions
--- a/service/fit.py
+++ b/service/fit.py
@@ -1011,7 +1011,7 @@ class Fit(object):
        # remove invalid modules when switching back to enabled fitting restrictions
        if not fit.ignoreRestrictions:
            for m in fit.modules:
-                if not m.isEmpty and not m.fits(fit):
+                if not m.isEmpty and not m.fits(fit, False):
                    self.removeModule(fit.ID, m.modPosition)

        eos.db.commit()