From c93b5e27c90e5257e9cc67b5bb373a7ed41a7225 Mon Sep 17 00:00:00 2001
From: wmayer <wmayer@users.sourceforge.net>
Date: Thu, 13 Apr 2023 15:02:32 +0200
Subject: [PATCH] PD: fix crash on Windows when loading PD workbench

---
 src/Mod/PartDesign/Gui/TaskChamferParameters.cpp   |  2 +-
 src/Mod/PartDesign/Gui/TaskDraftParameters.cpp     |  2 +-
 src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp   | 14 ++++++++++++--
 src/Mod/PartDesign/Gui/TaskDressUpParameters.h     |  4 ++--
 src/Mod/PartDesign/Gui/TaskFilletParameters.cpp    |  2 +-
 src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp |  2 +-
 6 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp b/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp
index 3990b2449a..98033ac01c 100644
--- a/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskChamferParameters.cpp
@@ -175,7 +175,7 @@ void TaskChamferParameters::onCheckBoxUseAllEdgesToggled(bool checked)
 void TaskChamferParameters::setButtons(const selectionModes mode)
 {
     ui->buttonRefSel->setChecked(mode == refSel);
-    ui->buttonRefSel->setText(mode == refSel ? btnPreviewStr : btnSelectStr);
+    ui->buttonRefSel->setText(mode == refSel ? btnPreviewStr() : btnSelectStr());
 }
 
 void TaskChamferParameters::onRefDeleted()
diff --git a/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp b/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp
index 91d14e3d68..513201ebcd 100644
--- a/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskDraftParameters.cpp
@@ -165,7 +165,7 @@ void TaskDraftParameters::onSelectionChanged(const Gui::SelectionChanges& msg)
 
 void TaskDraftParameters::setButtons(const selectionModes mode)
 {
-    ui->buttonRefSel->setText(mode == refSel ? btnPreviewStr : btnSelectStr);
+    ui->buttonRefSel->setText(mode == refSel ? btnPreviewStr() : btnSelectStr());
     ui->buttonRefSel->setChecked(mode == refSel);
     ui->buttonLine->setChecked(mode == line);
     ui->buttonPlane->setChecked(mode == plane);
diff --git a/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp b/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp
index 4add27e77b..33b71526a1 100644
--- a/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskDressUpParameters.cpp
@@ -51,8 +51,6 @@ FC_LOG_LEVEL_INIT("PartDesign",true,true)
 using namespace PartDesignGui;
 using namespace Gui;
 
-const QString TaskDressUpParameters::btnPreviewStr = tr("Preview");
-const QString TaskDressUpParameters::btnSelectStr = tr("Select");
 
 /* TRANSLATOR PartDesignGui::TaskDressUpParameters */
 
@@ -81,6 +79,18 @@ TaskDressUpParameters::~TaskDressUpParameters()
     Gui::Selection().rmvSelectionGate();
 }
 
+const QString TaskDressUpParameters::btnPreviewStr()
+{
+    static const QString text{ tr("Preview") };
+    return text;
+}
+
+const QString TaskDressUpParameters::btnSelectStr()
+{
+    static const QString text{ tr("Select") };
+    return text;
+}
+
 void TaskDressUpParameters::setupTransaction()
 {
     if (!DressUpView)
diff --git a/src/Mod/PartDesign/Gui/TaskDressUpParameters.h b/src/Mod/PartDesign/Gui/TaskDressUpParameters.h
index 50c35ee22d..0803ed7321 100644
--- a/src/Mod/PartDesign/Gui/TaskDressUpParameters.h
+++ b/src/Mod/PartDesign/Gui/TaskDressUpParameters.h
@@ -100,8 +100,8 @@ protected:
     selectionModes selectionMode;
     int transactionID;
 
-    static const QString btnPreviewStr;
-    static const QString btnSelectStr;
+    static const QString btnPreviewStr();
+    static const QString btnSelectStr();
 };
 
 /// simulation dialog for the TaskView
diff --git a/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp b/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp
index b0421e4c4a..5defa53669 100644
--- a/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskFilletParameters.cpp
@@ -128,7 +128,7 @@ void TaskFilletParameters::onCheckBoxUseAllEdgesToggled(bool checked)
 void TaskFilletParameters::setButtons(const selectionModes mode)
 {
     ui->buttonRefSel->setChecked(mode == refSel);
-    ui->buttonRefSel->setText(mode == refSel ? btnPreviewStr : btnSelectStr);
+    ui->buttonRefSel->setText(mode == refSel ? btnPreviewStr() : btnSelectStr());
 }
 
 void TaskFilletParameters::onRefDeleted()
diff --git a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp
index f35f892741..2841d519ac 100644
--- a/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp
+++ b/src/Mod/PartDesign/Gui/TaskThicknessParameters.cpp
@@ -131,7 +131,7 @@ void TaskThicknessParameters::onSelectionChanged(const Gui::SelectionChanges& ms
 void TaskThicknessParameters::setButtons(const selectionModes mode)
 {
     ui->buttonRefSel->setChecked(mode == refSel);
-    ui->buttonRefSel->setText(mode == refSel ? btnPreviewStr : btnSelectStr);
+    ui->buttonRefSel->setText(mode == refSel ? btnPreviewStr() : btnSelectStr());
 }
 
 void TaskThicknessParameters::onRefDeleted(void)