kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

+ fixes #0001549: crash with Draft move tool while sketch is in edit mode

Browse Source
This commit is contained in:
wmayer
2014-05-20 15:25:03 +02:00
parent 5fed27a003
commit 05e8a4f74c
16 changed files with 51 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/Fem/Gui/ViewProviderFemConstraintBearing.cpp
View File

@@ -77,7 +77,7 @@ bool ViewProviderFemConstraintBearing::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
} else if (constraintDialog != NULL) {

2
src/Mod/Fem/Gui/ViewProviderFemConstraintFixed.cpp
View File

@@ -77,7 +77,7 @@ bool ViewProviderFemConstraintFixed::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
} else if (constraintDialog != NULL) {

2
src/Mod/Fem/Gui/ViewProviderFemConstraintForce.cpp
View File

@@ -77,7 +77,7 @@ bool ViewProviderFemConstraintForce::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
} else if (constraintDialog != NULL) {

2
src/Mod/Fem/Gui/ViewProviderFemConstraintGear.cpp
View File

@@ -76,7 +76,7 @@ bool ViewProviderFemConstraintGear::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
} else if (constraintDialog != NULL) {

2
src/Mod/Fem/Gui/ViewProviderFemConstraintPulley.cpp
View File

@@ -75,7 +75,7 @@ bool ViewProviderFemConstraintPulley::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
} else if (constraintDialog != NULL) {

2
src/Mod/PartDesign/Gui/ViewProviderChamfer.cpp
View File

@@ -75,7 +75,7 @@ bool ViewProviderChamfer::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
}

2
src/Mod/PartDesign/Gui/ViewProviderDraft.cpp
View File

@@ -75,7 +75,7 @@ bool ViewProviderDraft::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
}

2
src/Mod/PartDesign/Gui/ViewProviderFillet.cpp
View File

@@ -75,7 +75,7 @@ bool ViewProviderFillet::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
}

2
src/Mod/PartDesign/Gui/ViewProviderGroove.cpp
View File

@@ -82,7 +82,7 @@ bool ViewProviderGroove::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
}

2
src/Mod/PartDesign/Gui/ViewProviderPad.cpp
View File

@@ -87,7 +87,7 @@ bool ViewProviderPad::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
}

2
src/Mod/PartDesign/Gui/ViewProviderPocket.cpp
View File

@@ -82,7 +82,7 @@ bool ViewProviderPocket::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
}

2
src/Mod/PartDesign/Gui/ViewProviderRevolution.cpp
View File

@@ -82,7 +82,7 @@ bool ViewProviderRevolution::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
}

2
src/Mod/PartDesign/Gui/ViewProviderTransformed.cpp
View File

@@ -178,7 +178,7 @@ const bool ViewProviderTransformed::checkDlgOpen(TaskDlgTransformedParameters* t
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
}

2
src/Mod/Sketcher/Gui/ViewProviderSketch.cpp
View File

@@ -2991,7 +2991,7 @@ bool ViewProviderSketch::setEdit(int ModNum)
msgBox.setDefaultButton(QMessageBox::Yes);
int ret = msgBox.exec();
if (ret == QMessageBox::Yes)
Gui::Control().closeDialog();
Gui::Control().reject();
else
return false;
}