From 32404e1ab6d36d92b1927a3910d14d54bf986c2a Mon Sep 17 00:00:00 2001
From: Dave Parker <dave.x.parker@gmail.com>
Date: Thu, 13 Apr 2017 00:28:36 +0000
Subject: [PATCH] Bugfix: Model labels get exported twice when there is also a
 properties file due to recent ModelInfo refacetoring.

git-svn-id: https://www.prismmodelchecker.org/svn/prism/prism/trunk@11984 bbc10eb1-c90d-0410-af57-cb519fbb1720
---
 prism/src/prism/Prism.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/prism/src/prism/Prism.java b/prism/src/prism/Prism.java
index c181d491..bc512e86 100644
--- a/prism/src/prism/Prism.java
+++ b/prism/src/prism/Prism.java
@@ -2705,8 +2705,9 @@ public class Prism extends PrismComponent implements PrismSettingsListener
 		List<String> labelNames = new ArrayList<String>();
 		labelNames.add("init");
 		labelNames.add("deadlock");
-		labelNames.addAll(currentModelInfo.getLabelNames());
-		if (propertiesFile != null) {
+		if (propertiesFile == null) {
+			labelNames.addAll(currentModelInfo.getLabelNames());
+		} else {
 			LabelList ll = propertiesFile.getCombinedLabelList();
 			int numLabels = ll.size();
 			for (int i = 0; i < numLabels; i++) {