From 31eec5bd1419aac09176ee7d349ad1e09c7f1f8b Mon Sep 17 00:00:00 2001
From: Anthony Geay <anthony.geay@edf.fr>
Date: Mon, 11 Dec 2017 10:40:08 +0100
Subject: [PATCH] Merge V8_4_BR branch.

---
 CMakeLists.txt                                              | 2 +-
 .../ParaViewPlugin/pqMEDReaderTimesFlagsWidget.cxx          | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f8823f0..8a316b74 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 4)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
 
 # Common CMake macros
 # ===================
diff --git a/src/Plugins/MEDReader/ParaViewPlugin/pqMEDReaderTimesFlagsWidget.cxx b/src/Plugins/MEDReader/ParaViewPlugin/pqMEDReaderTimesFlagsWidget.cxx
index 60e57e14..de01f7bb 100644
--- a/src/Plugins/MEDReader/ParaViewPlugin/pqMEDReaderTimesFlagsWidget.cxx
+++ b/src/Plugins/MEDReader/ParaViewPlugin/pqMEDReaderTimesFlagsWidget.cxx
@@ -216,7 +216,9 @@ void pqMEDReaderTimesFlagsWidget::UpdateTimeSteps()
 
     // Updating times steps using leaf id
     QStringList dts, its, tts;
-    pqMedReaderGraphUtils::getCurrentTS(g, tsId, dts, its, tts);
-    this->TimesVectWidget->setItems(dts, its, tts);
+    if(g)
+      pqMedReaderGraphUtils::getCurrentTS(g, tsId, dts, its, tts);
+    if(this->TimesVectWidget)
+      this->TimesVectWidget->setItems(dts, its, tts);
     }
 }
-- 
2.39.2