[qet] [1958] Conductor properties: sometimes the PEN button was erroneously enabled.

[subversion@xxxxxxxxxxxxx]

Revision: 1958
Author:   xavier
Date:     2012-11-05 19:19:25 +0100 (Mon, 05 Nov 2012)
Log Message:
-----------
Conductor properties: sometimes the PEN button was erroneously enabled.

Modified Paths:
--------------
    trunk/sources/conductorpropertieswidget.cpp

Modified: trunk/sources/conductorpropertieswidget.cpp
===================================================================
--- trunk/sources/conductorpropertieswidget.cpp	2012-11-04 18:38:32 UTC (rev 1957)
+++ trunk/sources/conductorpropertieswidget.cpp	2012-11-05 18:19:25 UTC (rev 1958)
@@ -227,7 +227,7 @@
 	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());