1 files changed, 15 insertions, 14 deletions
diff --git a/Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp b/Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp
index 9ecc8e0..7f6c23d 100644
--- a/Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp
+++ b/Swift/QtUI/QtVCardWidget/QtVCardOrganizationField.cpp
@@ -96,23 +96,24 @@ VCard::Organization QtVCardOrganizationField::getOrganization() const {
 }
 
 void QtVCardOrganizationField::handleEditibleChanged(bool isEditable) {
-	if (organizationLineEdit) {
-		organizationLineEdit->setVisible(isEditable);
-		organizationLabel->setVisible(!isEditable);
-
-		if (!isEditable) {
-			QString label;
-			for(int i=0; i < unitsTreeWidget->topLevelItemCount(); ++i) {
-				QTreeWidgetItem* row = unitsTreeWidget->topLevelItem(i);
-				if (!row->text(0).isEmpty()) {
-					label += row->text(0) + ", ";
-				}
+	assert(organizationLineEdit);
+	assert(unitsTreeWidget);
+
+	organizationLineEdit->setVisible(isEditable);
+	organizationLabel->setVisible(!isEditable);
+
+	if (!isEditable) {
+		QString label;
+		for(int i=0; i < unitsTreeWidget->topLevelItemCount(); ++i) {
+			QTreeWidgetItem* row = unitsTreeWidget->topLevelItem(i);
+			if (!row->text(0).isEmpty()) {
+				label += row->text(0) + ", ";
 			}
-			label += organizationLineEdit->text();
-			organizationLabel->setText(label);
 		}
+		label += organizationLineEdit->text();
+		organizationLabel->setText(label);
 	}
-	if (unitsTreeWidget) unitsTreeWidget->setVisible(isEditable);
+	unitsTreeWidget->setVisible(isEditable);
 }
 
 void QtVCardOrganizationField::handleItemChanged(QTreeWidgetItem *, int) {