From 1918a70d2194679b39b248846b5f362184ffca38 Mon Sep 17 00:00:00 2001
From: Magne Sjaastad <magne.sjaastad@ceetronsolutions.com>
Date: Wed, 22 Nov 2017 09:15:48 +0100
Subject: [PATCH] #2158 Curve Address Selection : Select first case as default

---
 .../UserInterface/RiuSummaryCurveDefSelection.cpp      | 10 ++++++++--
 .../RiuSummaryCurveDefSelectionDialog.cpp              |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
index ccf21720d7..0bfdef9445 100644
--- a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
+++ b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelection.cpp
@@ -298,10 +298,16 @@ void RiuSummaryCurveDefSelection::setSelectedCurveDefinitions(const std::vector<
         RimSummaryCase* summaryCase = caseAddressPair.summaryCase();
         if (!summaryCase) continue;
 
-        const RifEclipseSummaryAddress& summaryAddress = caseAddressPair.summaryAddress();
+        RifEclipseSummaryAddress summaryAddress = caseAddressPair.summaryAddress();
+        if (summaryAddress.category() == RifEclipseSummaryAddress::SUMMARY_INVALID)
+        {
+            // If we have an invalid address, set the default adress to Field
+            summaryAddress = RifEclipseSummaryAddress::fieldVarAddress(summaryAddress.quantityName());
+        }
 
         // Select summary category if not already selected
         auto& selectedCategories = m_selectedSummaryCategories();
+
         if (std::find(selectedCategories.begin(), selectedCategories.end(),
                       summaryAddress.category()) == selectedCategories.end())
         {
@@ -310,7 +316,7 @@ void RiuSummaryCurveDefSelection::setSelectedCurveDefinitions(const std::vector<
 
         if (curveDefinitions.size() == 1)
         {
-            m_currentSummaryCategory = curveDefinitions[0].summaryAddress().category();
+            m_currentSummaryCategory = summaryAddress.category();
         }
 
         // Select case if not already selected
diff --git a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.cpp b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.cpp
index f4d1bd197a..e1e6ae60c3 100644
--- a/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.cpp
+++ b/ApplicationCode/UserInterface/RiuSummaryCurveDefSelectionDialog.cpp
@@ -74,7 +74,7 @@ RiuSummaryCurveDefSelectionDialog::~RiuSummaryCurveDefSelectionDialog()
 //--------------------------------------------------------------------------------------------------
 void RiuSummaryCurveDefSelectionDialog::setCaseAndAddress(RimSummaryCase* summaryCase, const RifEclipseSummaryAddress& address)
 {
-    if (summaryCase && address.isValid())
+    if (summaryCase)
     {
         std::vector<RiaSummaryCurveDefinition> sumCasePairs;
         sumCasePairs.push_back(RiaSummaryCurveDefinition(summaryCase, address));