From ddbf8e0e2d96665e64c9c8604d82f500b910e69e Mon Sep 17 00:00:00 2001 From: wmayer Date: Wed, 5 Jan 2022 14:05:05 +0100 Subject: [PATCH] Sketcher: avoid attaching to/detaching from the same parameter group twice --- src/Mod/PartDesign/App/FeatureHole.cpp | 2 +- src/Mod/Sketcher/Gui/ViewProviderSketch.cpp | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/Mod/PartDesign/App/FeatureHole.cpp b/src/Mod/PartDesign/App/FeatureHole.cpp index 2055ae60d4..e96e8212de 100644 --- a/src/Mod/PartDesign/App/FeatureHole.cpp +++ b/src/Mod/PartDesign/App/FeatureHole.cpp @@ -2200,7 +2200,7 @@ void from_json(const nlohmann::json &j, Hole::CutDimensionSet &t) else if (thread_type_string == "metricfine") t.thread_type = Hole::CutDimensionSet::MetricFine; else - throw Base::IndexError(std::string("Thread type ‘") + thread_type_string + "’ unsupported"); + throw Base::IndexError(std::string(u8"Thread type ‘") + thread_type_string + u8"’ unsupported"); std::string cut_type_string = j["cut_type"].get(); if (cut_type_string == "counterbore") { diff --git a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp index f104b6e68c..ccc3ac489b 100644 --- a/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp +++ b/src/Mod/Sketcher/Gui/ViewProviderSketch.cpp @@ -185,9 +185,6 @@ void ViewProviderSketch::ParameterObserver::subscribeToParameters() ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher/General"); hGrp->Attach(this); - ParameterGrp::handle hGrpskg = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher/General"); - hGrpskg->Attach(this); - ParameterGrp::handle hGrp2 = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher"); hGrp2->Attach(this); } @@ -197,9 +194,6 @@ void ViewProviderSketch::ParameterObserver::unsubscribeToParameters() ParameterGrp::handle hGrp = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher/General"); hGrp->Detach(this); - ParameterGrp::handle hGrpskg = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher/General"); - hGrpskg->Detach(this); - ParameterGrp::handle hGrp2 = App::GetApplication().GetParameterGroupByPath("User parameter:BaseApp/Preferences/Mod/Sketcher"); hGrp2->Detach(this); }