diff --git a/CHANGELOG.md b/CHANGELOG.md index 4bca36a5..ba91a5bf 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -15,6 +15,7 @@ CHANGELOG for FlatCAM beta - added a new set of options in the Preferences for the Milling Plugin by taking them out of the Geometry section - fixed an error in the Subtract Plugin when working on Geometry objects - fixed ParseFont such that the output of the Text Plugin in the Geometry Editor can now be painted using the Paint Plugin +- fixed errors when using the new ... canvas context menu entries which crated a hard crash 22.03.2021 diff --git a/appObjects/FlatCAMGeometry.py b/appObjects/FlatCAMGeometry.py index 56f9907a..ad558c6d 100644 --- a/appObjects/FlatCAMGeometry.py +++ b/appObjects/FlatCAMGeometry.py @@ -168,7 +168,11 @@ class GeometryObject(FlatCAMObj, Geometry): self.ser_attrs += ['options', 'kind', 'multigeo', 'fill_color', 'outline_color', 'alpha_level'] def build_ui(self): - self.ui_disconnect() + try: + self.ui_disconnect() + except RuntimeError: + return + FlatCAMObj.build_ui(self) # Area Exception - exclusion shape added signal diff --git a/app_Main.py b/app_Main.py index 7eeb6a45..5eceb4bd 100644 --- a/app_Main.py +++ b/app_Main.py @@ -2044,10 +2044,10 @@ class App(QtCore.QObject): def connect_filemenu_signals(self): # ### Menu self.ui.menufilenewproject.triggered.connect(self.f_handlers.on_file_new_click) - self.ui.menufilenewgeo.triggered.connect(self.app_obj.new_geometry_object) - self.ui.menufilenewgrb.triggered.connect(self.app_obj.new_gerber_object) - self.ui.menufilenewexc.triggered.connect(self.app_obj.new_excellon_object) - self.ui.menufilenewdoc.triggered.connect(self.app_obj.new_document_object) + self.ui.menufilenewgeo.triggered.connect(lambda: self.app_obj.new_geometry_object()) + self.ui.menufilenewgrb.triggered.connect(lambda: self.app_obj.new_gerber_object()) + self.ui.menufilenewexc.triggered.connect(lambda: self.app_obj.new_excellon_object()) + self.ui.menufilenewdoc.triggered.connect(lambda: self.app_obj.new_document_object()) self.ui.menufileopengerber.triggered.connect(self.f_handlers.on_fileopengerber) self.ui.menufileopenexcellon.triggered.connect(self.f_handlers.on_fileopenexcellon) @@ -2187,10 +2187,10 @@ class App(QtCore.QObject): self.ui.popmenu_disable.triggered.connect(lambda: self.toggle_plots(self.collection.get_selected())) self.ui.popmenu_panel_toggle.triggered.connect(self.ui.on_toggle_notebook) - self.ui.popmenu_new_geo.triggered.connect(self.app_obj.new_geometry_object) - self.ui.popmenu_new_grb.triggered.connect(self.app_obj.new_gerber_object) - self.ui.popmenu_new_exc.triggered.connect(self.app_obj.new_excellon_object) - self.ui.popmenu_new_prj.triggered.connect(self.f_handlers.on_file_new_project) + self.ui.popmenu_new_geo.triggered.connect(lambda: self.app_obj.new_geometry_object()) + self.ui.popmenu_new_grb.triggered.connect(lambda: self.app_obj.new_gerber_object()) + self.ui.popmenu_new_exc.triggered.connect(lambda: self.app_obj.new_excellon_object()) + self.ui.popmenu_new_prj.triggered.connect(lambda: self.f_handlers.on_file_new_project()) self.ui.zoomfit.triggered.connect(self.on_zoom_fit) self.ui.clearplot.triggered.connect(self.clear_plots)