summaryrefslogtreecommitdiff
path: root/sim
diff options
context:
space:
mode:
Diffstat (limited to 'sim')
-rw-r--r--sim/universe.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/sim/universe.cc b/sim/universe.cc
index 52353db11..115f6f790 100644
--- a/sim/universe.cc
+++ b/sim/universe.cc
@@ -143,7 +143,8 @@ CREATE_SIM_OBJECT(Root)
__ticksPerNS = freq / 1.0e9;
__ticksPerPS = freq / 1.0e12;
- if (output_dir.isValid()) {
+ outputDirectory = output_dir;
+ if (!outputDirectory.empty()) {
outputDirectory = output_dir;
// guarantee that directory ends with a '/'
@@ -159,9 +160,10 @@ CREATE_SIM_OBJECT(Root)
}
outputStream = makeOutputStream(output_file);
- configStream = config_output_file.isValid()
- ? makeOutputStream(config_output_file)
- : outputStream;
+ configStream = outputStream;
+ string cof = config_output_file;
+ if (!cof.empty())
+ configStream = makeOutputStream(cof);
return root;
}