diff --git a/CHANGELOG.md b/CHANGELOG.md index b839137c..a0d03843 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,6 +26,7 @@ CHANGELOG for FlatCAM beta - fixed Tcl command Copper Clear (NCC) - fixed Tcl command Paint - temporary fix for comboboxes not finding the the value in the items when setting themselves with a value by defaulting to the first item in the list +- fix in Tool Subtract where there was a typo 27.10.2020 diff --git a/appGUI/GUIElements.py b/appGUI/GUIElements.py index 1f8e8d5f..efa2d160 100644 --- a/appGUI/GUIElements.py +++ b/appGUI/GUIElements.py @@ -2133,8 +2133,8 @@ class FCComboBox(QtWidgets.QComboBox): idx = self.findText(str(val)) if idx == -1: self.setCurrentIndex(0) - else: - self.setCurrentIndex(idx) + return + self.setCurrentIndex(idx) @property def is_last(self): diff --git a/appTools/ToolSub.py b/appTools/ToolSub.py index 42111146..9b2c555a 100644 --- a/appTools/ToolSub.py +++ b/appTools/ToolSub.py @@ -205,7 +205,7 @@ class ToolSub(AppTool): app_obj.inform.emit("%s" % _("Subtraction aperture processing finished.")) - outname = self.target_gerber_combo.currentText() + '_sub' + outname = self.ui.target_gerber_combo.currentText() + '_sub' self.aperture_processing_finished.emit(outname, output) self.app.worker_task.emit({'fcn': worker_job, 'params': [self.app]})