From 8c40489049c9ee648c685c42acd9334dfb752514 Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Sat, 20 Apr 2019 03:59:08 +0300
Subject: [PATCH] Fix wrong log message

---
 gui/builtinViews/fittingView.py             | 2 +-
 gui/fitCommands/calc/module/localReplace.py | 4 ++--
 service/fit.py                              | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gui/builtinViews/fittingView.py b/gui/builtinViews/fittingView.py
index f4b6e0a54..49363d41e 100644
--- a/gui/builtinViews/fittingView.py
+++ b/gui/builtinViews/fittingView.py
@@ -555,7 +555,7 @@ class FittingView(d.Display):
         contexts = []
 
         while sel != -1:
-            
+
             if sel not in self.blanks:
                 mod = self.mods[self.GetItemData(sel)]
                 # Test if this is a mode, which is a special snowflake of a Module
diff --git a/gui/fitCommands/calc/module/localReplace.py b/gui/fitCommands/calc/module/localReplace.py
index 4db89ff77..6627baec8 100644
--- a/gui/fitCommands/calc/module/localReplace.py
+++ b/gui/fitCommands/calc/module/localReplace.py
@@ -24,7 +24,7 @@ class CalcReplaceLocalModuleCommand(wx.Command):
         self.unloadedCharge = None
 
     def Do(self):
-        pyfalog.debug('Doing replacement of local module at position {} to {} on fit {}'.format(self.newModInfo, self.position, self.fitID))
+        pyfalog.debug('Doing replacement of local module at position {} to {} on fit {}'.format(self.position, self.newModInfo, self.fitID))
         self.unloadedCharge = False
         sFit = Fit.getInstance()
         fit = sFit.getFit(self.fitID)
@@ -63,7 +63,7 @@ class CalcReplaceLocalModuleCommand(wx.Command):
         return True
 
     def Undo(self):
-        pyfalog.debug('Undoing replacement of local module at position {} to {} on fit {}'.format(self.newModInfo, self.position, self.fitID))
+        pyfalog.debug('Undoing replacement of local module at position {} to {} on fit {}'.format(self.position, self.newModInfo, self.fitID))
         sFit = Fit.getInstance()
         fit = sFit.getFit(self.fitID)
         # Remove if there was no module
diff --git a/service/fit.py b/service/fit.py
index 8d8b3ffbf..7ce5bf351 100644
--- a/service/fit.py
+++ b/service/fit.py
@@ -437,7 +437,7 @@ class Fit(FitDeprecated):
         changedProjMods = {}
         changedProjDrones = {}
         for pos, mod in enumerate(fit.modules):
-            if mod != base:
+            if mod is not base:
                 # fix for #529, where a module may be in incorrect state after CCP changes mechanics of module
                 if not mod.canHaveState(mod.state) or not mod.isValidState(mod.state):
                     changedMods[pos] = mod.state