Merge branch release-5-1

[alexxy/gromacs.git] / src / gromacs / utility / datafilefinder.cpp

diff --git a/src/gromacs/utility/datafilefinder.cpp b/src/gromacs/utility/datafilefinder.cpp
index 1dcfe1dac8ad88b30c93e16d5b65c87be686e28e..af7020e9395e129e74add506c511d3ba9a339108 100644 (file)
--- a/src/gromacs/utility/datafilefinder.cpp
+++ b/src/gromacs/utility/datafilefinder.cpp
@@ -1,7 +1,7 @@
 /*
  * This file is part of the GROMACS molecular simulation package.
  *
- * Copyright (c) 2014,2015, by the GROMACS development team, led by
+ * Copyright (c) 2014,2015,2016, by the GROMACS development team, led by
  * Mark Abraham, David van der Spoel, Berk Hess, and Erik Lindahl,
  * and including many others, as listed in the AUTHORS file in the
  * top-level source directory and at http://www.gromacs.org.
@@ -109,7 +109,7 @@ void DataFileFinder::setSearchPathFromEnv(const char *envVarName)
     }
     impl_->envName_ = envVarName;
     const char *const lib = getenv(envVarName);
-    if (lib != NULL)
+    if (!isNullOrEmpty(lib))
     {
         impl_->bEnvIsSet_ = true;
         Path::splitPathEnvironment(lib, &impl_->searchPath_);