Merge remote-tracking branch 'origin/master' into develop

This commit is contained in:
Mark Olesen
2018-01-25 11:59:12 +01:00

View File

@ -736,7 +736,8 @@ bool Foam::functionObjects::timeControl::read(const dictionary& dict)
executeControl_.read(dict);
readControls();
return true;
// Forward to underlying function object
return foPtr_->read(dict);
}
return false;