Merge remote-tracking branch 'origin/NGO_External_Browser'

[modules/gui.git] / src / SalomeApp / SalomeApp_StudyPropertiesDlg.cxx

diff --git a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx
index 9752236237edd5dbbcd93a8aef9be9a7f7bddaee..043a2e30c1ca8ec91647354a1be46fd3f317a3eb 100644 (file)
--- a/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx
+++ b/src/SalomeApp/SalomeApp_StudyPropertiesDlg.cxx
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2014  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2016  CEA/DEN, EDF R&D, OPEN CASCADE
 //
 // Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
 // CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
@@ -62,7 +62,7 @@ SalomeApp_StudyPropertiesDlg::SalomeApp_StudyPropertiesDlg(QWidget* parent)
   : QDialog(parent, Qt::WindowTitleHint | Qt::WindowSystemMenuHint ),
     myIsChanged(false)
 {
-  setModal( TRUE );
+  setModal( true );
 
   setWindowTitle(tr("TLT_STUDY_PROPERTIES"));
   setSizeGripEnabled( true );
@@ -173,7 +173,7 @@ SalomeApp_StudyPropertiesDlg::~SalomeApp_StudyPropertiesDlg()
 */
 void SalomeApp_StudyPropertiesDlg::initData()
 {
-  bool hasData = myStudyDoc;
+  bool hasData = (myStudyDoc != NULL);
   _PTR(AttributeStudyProperties) propAttr;
   if (hasData)
     propAttr = myStudyDoc->GetProperties();