From 0ef85e5b971409e68e2a6dfcefb40463661eddcd Mon Sep 17 00:00:00 2001
From: xavier
 <xavier@r991  xavier  2010-05-09 20:40:08 +0200 (dim. 09 mai 2010)>
Date: Mon, 5 Nov 2012 18:19:25 +0000
Subject: [PATCH] Conductor properties: sometimes the PEN button was
 erroneously enabled.

git-svn-id: svn+ssh://svn.tuxfamily.org/svnroot/qet/qet/trunk@1958 bfdf4180-ca20-0410-9c96-a3a8aa849046
---
 sources/conductorpropertieswidget.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sources/conductorpropertieswidget.cpp b/sources/conductorpropertieswidget.cpp
index 6fe1ba5b9..94a6f9f8d 100644
--- a/sources/conductorpropertieswidget.cpp
+++ b/sources/conductorpropertieswidget.cpp
@@ -227,7 +227,7 @@ void ConductorPropertiesWidget::updateDisplay() {
 	ground_checkbox -> setChecked(properties_.singleLineProperties.hasGround);
 	neutral_checkbox -> setChecked(properties_.singleLineProperties.hasNeutral);
 	merge_checkbox -> setChecked(properties_.singleLineProperties.is_pen);
-	merge_checkbox -> setEnabled(!isReadOnly() && ground_checkbox -> isChecked() && neutral_checkbox -> isChecked());
+	merge_checkbox -> setEnabled(!isReadOnly() && properties_.type == ConductorProperties::Single && ground_checkbox -> isChecked() && neutral_checkbox -> isChecked());
 	phase_spinbox -> setValue(properties_.singleLineProperties.phasesCount());
 	phase_slider -> setValue(properties_.singleLineProperties.phasesCount());
 	phase_checkbox -> setChecked(properties_.singleLineProperties.phasesCount());