Fix running simulation with no world specified on the command line (#…

…1463) Signed-off-by: Nate Koenig <[email protected]> Co-authored-by: Nate Koenig <[email protected]>
gazebosim · May 2, 2022 · b6186a8 · b6186a8
1 parent 0a5828e
commit b6186a8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/include/ignition/gazebo/ServerConfig.hh b/include/ignition/gazebo/ServerConfig.hh
@@ -172,7 +172,8 @@ namespace ignition
       /// Setting the SDF file will override any value set by `SetSdfString`.
       ///
       /// \param[in] _file Full path to an SDF file.
-      /// \return (reserved for future use)
+      /// \return True if the file was set, false if the file was not set.
+      /// The file will not be set if the provide _file string is empty.
       public: bool SetSdfFile(const std::string &_file);
 
       /// \brief Get the SDF file that has been set. An empty string will be

diff --git a/src/ServerConfig.cc b/src/ServerConfig.cc
@@ -327,6 +327,9 @@ ServerConfig::~ServerConfig() = default;
 //////////////////////////////////////////////////
 bool ServerConfig::SetSdfFile(const std::string &_file)
 {
+  if (_file.empty())
+    return false;
+
   this->dataPtr->source = ServerConfig::SourceType::kSdfFile;
   this->dataPtr->sdfFile = _file;
   this->dataPtr->sdfString = "";