Merge branch 'singularity' into master
This commit is contained in:
@@ -63,8 +63,8 @@ class GuiCargoToLocalModuleCommand(wx.Command):
|
|||||||
dstModSlot = dstMod.slot
|
dstModSlot = dstMod.slot
|
||||||
if self.srcCargoItemID == dstModItemID:
|
if self.srcCargoItemID == dstModItemID:
|
||||||
return False
|
return False
|
||||||
# To keep all old item properties, copy them over from old module
|
# To keep all old item properties, copy them over from old module, except for mutations
|
||||||
newModInfo = ModuleInfo.fromModule(dstMod)
|
newModInfo = ModuleInfo.fromModule(dstMod, unmutate=True)
|
||||||
newModInfo.itemID = self.srcCargoItemID
|
newModInfo.itemID = self.srcCargoItemID
|
||||||
if dstMod.isEmpty:
|
if dstMod.isEmpty:
|
||||||
newCargoModItemID = None
|
newCargoModItemID = None
|
||||||
|
|||||||
Reference in New Issue
Block a user