summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Helfrich <helfrich9000@gmail.com>2008-01-23 17:34:18 +0000
committerBrian Helfrich <helfrich9000@gmail.com>2008-01-23 17:34:18 +0000
commit437389b3e2b57424929353312cb035fe1789d1e3 (patch)
treef032fbd18cf2b1859d41a8e08d0189f509320267
parent05a161ace6cad83989ee41fe3051104df2a5fa98 (diff)
downloadnanoengineer-437389b3e2b57424929353312cb035fe1789d1e3.tar.gz
nanoengineer-437389b3e2b57424929353312cb035fe1789d1e3.zip
The open data store function now checks for a null directory.
-rwxr-xr-xcad/plugins/HDF5_SimResults/src/HDF5_SimResults.cpp14
1 files changed, 11 insertions, 3 deletions
diff --git a/cad/plugins/HDF5_SimResults/src/HDF5_SimResults.cpp b/cad/plugins/HDF5_SimResults/src/HDF5_SimResults.cpp
index 56d06db22..a54a34db9 100755
--- a/cad/plugins/HDF5_SimResults/src/HDF5_SimResults.cpp
+++ b/cad/plugins/HDF5_SimResults/src/HDF5_SimResults.cpp
@@ -69,11 +69,19 @@ void HDF5_SimResults::closeDatasets() {
/* FUNCTION: openDataStore */
int HDF5_SimResults::openDataStore(const char* directory,
std::string& message) {
- if (directory != 0)
- dataStoreDirectory = directory;
-
int resultCode = 0;
+ if (directory != 0) {
+ dataStoreDirectory = directory;
+
+ } else {
+ resultCode = SRDS_UNABLE_TO_OPEN_FILE;
+ message = "Null passed for directory.";
+
+ // Abort
+ return resultCode;
+ }
+
// Build the filepath
std::string filepath = directory;
filepath.append("/").append(HDF5_SIM_RESULT_FILENAME);