Tool line. Block selecting the same point twice.

(grafted from 0029c3e3b5ae45d21f834f0d36023d8ef9734345)

--HG--
branch : develop
This commit is contained in:
Roman Telezhynskyi 2016-02-09 17:19:14 +02:00
parent 863b62cd6e
commit aa64076a36
2 changed files with 9 additions and 5 deletions

View File

@ -6,6 +6,7 @@
- [#325] Check pattern for inverse compatibility.
# Version 0.4.2
- Tool line. Block selecting the same point twice.
- [#443] Not valid dxf file. libdxf updated to version 3.12.2.0. Fixed drawing subpaths.
- Fixed combobox width in Dialog "Tool True Dart point".
- [#441] Broken reference incrementation for tool "True Dart point".

View File

@ -182,13 +182,16 @@ void DialogLine::ChosenObject(quint32 id, const SceneObject &type)
}
break;
case 1:
if (SetObject(id, ui->comboBoxSecondPoint, ""))
if (getCurrentObjectId(ui->comboBoxFirstPoint) != id)
{
if (flagError)
if (SetObject(id, ui->comboBoxSecondPoint, ""))
{
number = 0;
prepare = true;
DialogAccepted();
if (flagError)
{
number = 0;
prepare = true;
DialogAccepted();
}
}
}
break;