From aee23cf700785d0200162759c1dc349456d16f90 Mon Sep 17 00:00:00 2001 From: Roman Telezhynskyi Date: Tue, 9 Feb 2016 14:45:31 +0200 Subject: [PATCH] Tool line. Block selecting the same point twice. --HG-- branch : release --- ChangeLog.txt | 1 + src/libs/vtools/dialogs/tools/dialogline.cpp | 13 ++++++++----- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog.txt b/ChangeLog.txt index dd61fbef0..7b88a3d21 100644 --- a/ChangeLog.txt +++ b/ChangeLog.txt @@ -1,4 +1,5 @@ # 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". diff --git a/src/libs/vtools/dialogs/tools/dialogline.cpp b/src/libs/vtools/dialogs/tools/dialogline.cpp index 04545ebf2..e8848e671 100644 --- a/src/libs/vtools/dialogs/tools/dialogline.cpp +++ b/src/libs/vtools/dialogs/tools/dialogline.cpp @@ -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;