Quellcode durchsuchen

Fix for exception while merging excellons if there is no slots in second one

Dmitriy Klabukov vor 5 Jahren
Ursprung
Commit
4abeb7e539
1 geänderte Dateien mit 2 neuen und 1 gelöschten Zeilen
  1. 2 1
      appObjects/FlatCAMExcellon.py

+ 2 - 1
appObjects/FlatCAMExcellon.py

@@ -1313,7 +1313,8 @@ class ExcellonObject(FlatCAMObj, Excellon):
                             break
                     if t:
                         fused_tools_dict[t]['drills'] += tool_dict['drills']
-                        fused_tools_dict[t]['slots'] += tool_dict['slots']
+                        if 'slots' in tool_dict and tool_dict['slots']:
+                                fused_tools_dict[t]['slots'] += tool_dict['slots']
                         fused_tools_dict[t]['solid_geometry'] += tool_dict['solid_geometry']
                 else:
                     fused_tools_dict[toolid] = tool_dict