Skip to content

Commit

Permalink
Fix ticktock logic
Browse files Browse the repository at this point in the history
Signed-off-by: methylDragon <[email protected]>
  • Loading branch information
methylDragon committed Jun 17, 2022
1 parent ac44311 commit f7d2071
Showing 1 changed file with 3 additions and 17 deletions.
20 changes: 3 additions & 17 deletions src/Plugin.cc
Original file line number Diff line number Diff line change
Expand Up @@ -181,10 +181,7 @@ void Plugin::Load(const tinyxml2::XMLElement *_pluginElem)
{
gzwarn << "The `ignition-gui` element is deprecated. Please use "
<< "`gz-gui` instead." << std::endl;
}
else
{
this->LoadCommonConfig(_pluginElem->FirstChildElement("gz-gui"));
this->LoadCommonConfig(_pluginElem->FirstChildElement("ignition-gui"));
}
}

Expand Down Expand Up @@ -317,19 +314,8 @@ std::string Plugin::ConfigStr()
auto guiElem = pluginElem->FirstChildElement("gz-gui");
if (!guiElem)
{
// TODO(CH3): Deprecated. Remove on tock.
// Undent else block and remove else conditional
guiElem = pluginElem->FirstChildElement("ignition-gui");
if (guiElem)
{
gzwarn << "The `ignition-gui` element is deprecated. Please use "
<< "`gz-gui` instead." << std::endl;
}
else
{
guiElem = doc.NewElement("gz-gui");
pluginElem->InsertEndChild(guiElem);
}
guiElem = doc.NewElement("gz-gui");
pluginElem->InsertEndChild(guiElem);
}

// Clean <property>s
Expand Down

0 comments on commit f7d2071

Please sign in to comment.