GIT_REPOSITORIES/LPP/Users/mperrinel/SCIQLOP-Initialisation Commit - r722:1590606c0dcd

Fixes crashes on release when duplicating/renaming a variable

Alexandre Leroux -

r722:1590606c0dcd

parent child

Context file:

r722:1590606c0dcd

Collapse all files

gui/src/Variable/VariableInspectorWidget.cpp +19 -12

                      if (selectedVariables.size() == 1) {
                          auto selectedVariable = selectedVariables.front();
-                         auto duplicateFun = [&selectedVariable]() {
-                             sqpApp->variableController().cloneVariable(selectedVariable);
+                         auto duplicateFun = [varW = std::weak_ptr<Variable>(selectedVariable)]()
+                         {
+                             if (auto var = varW.lock()) {
+                                 sqpApp->variableController().cloneVariable(var);
+                             }
                          };
                          tableMenu.addAction(tr("Duplicate"), duplicateFun);
-                         auto renameFun = [&selectedVariable, &model, this]() {
-                             // Generates forbidden names (names associated to existing variables)
-                             auto allVariables = model->variables();
-                             auto forbiddenNames = QVector<QString>(allVariables.size());
-                             std::transform(allVariables.cbegin(), allVariables.cend(), forbiddenNames.begin(),
-                                            [](const auto &variable) { return variable->name(); });
-                             RenameVariableDialog dialog{selectedVariable->name(), forbiddenNames, this};
-                             if (dialog.exec() == QDialog::Accepted) {
-                                 selectedVariable->setName(dialog.name());
+                         auto renameFun = [ varW = std::weak_ptr<Variable>(selectedVariable), &model, this ]()
+                         {
+                             if (auto var = varW.lock()) {
+                                 // Generates forbidden names (names associated to existing variables)
+                                 auto allVariables = model->variables();
+                                 auto forbiddenNames = QVector<QString>(allVariables.size());
+                                 std::transform(allVariables.cbegin(), allVariables.cend(),
+                                                forbiddenNames.begin(),
+                                                [](const auto &variable) { return variable->name(); });
+                                 RenameVariableDialog dialog{var->name(), forbiddenNames, this};
+                                 if (dialog.exec() == QDialog::Accepted) {
+                                     var->setName(dialog.name());
+                                 }
                              }
                          };

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages