Merge V8_4_BR branch.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9f8823f01f0e2bbe9003489c0e2b70c34ad88b2b..8a316b74f26c39f208d5a859a6aae07e2f82edd7 100644 (file)
--- 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 60e57e14ff12c22fd8d75e37840e0a325a0efb66..de01f7bb81ea654e6a4fb99c78b88d1bac736c34 100644 (file)
--- 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);
     }
 }