From 0dcba178fdbaf6b119e45156b92f772829742007 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Thu, 6 Nov 2014 09:35:39 +0100
Subject: [PATCH] Do not show NNC text at all in progress bar when NNC import
 is disabled

---
 .../FileInterface/RifReaderEclipseOutput.cpp  | 22 ++++++++++---------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
index 0861b22bd3..18f7aabff0 100644
--- a/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
+++ b/ApplicationCode/FileInterface/RifReaderEclipseOutput.cpp
@@ -435,26 +435,28 @@ bool RifReaderEclipseOutput::open(const QString& fileName, RigCaseData* eclipseC
     buildMetaData();
     progInfo.incrementProgress();
 
-    progInfo.setProgressDescription("Reading NNC data");
-    progInfo.setNextProgressIncrement(5);
     if (isNNCsEnabled())
     {
+        progInfo.setProgressDescription("Reading NNC data");
+        progInfo.setNextProgressIncrement(5);
         transferNNCData(mainEclGrid, m_ecl_init_file, eclipseCase->mainGrid());
-    }
-    progInfo.incrementProgress();
+        progInfo.incrementProgress();
 
-    progInfo.setProgressDescription("Processing NNC data");
-    progInfo.setNextProgressIncrement(20);
-    if (isNNCsEnabled())
-    {
+        progInfo.setProgressDescription("Processing NNC data");
+        progInfo.setNextProgressIncrement(20);
         eclipseCase->mainGrid()->nncData()->processConnections( *(eclipseCase->mainGrid()));
+        progInfo.incrementProgress();
+    }
+    else
+    {
+        progInfo.setNextProgressIncrement(25);
+        progInfo.incrementProgress();
     }
-    progInfo.incrementProgress();
 
     progInfo.setNextProgressIncrement(8);
     progInfo.setProgressDescription("Reading Well information");
-
     readWellCells(mainEclGrid, isImportOfCompleteMswDataEnabled());
+    progInfo.incrementProgress();
 
     progInfo.setProgressDescription("Releasing reader memory");
     ecl_grid_free( mainEclGrid );