Skip to content
Snippets Groups Projects
Commit 5da8e211 authored by bpwilcox's avatar bpwilcox
Browse files

fix rebase issue

fix uncrustify
parent e6092fa6
No related branches found
No related tags found
No related merge requests found
......@@ -203,7 +203,7 @@ LifecycleManager::shutdown()
shutdownAllNodes();
destroyLifecycleServiceClients();
message("Managed nodes have been shut down");
system_active_ = false;
system_active_ = false;
return true;
}
......@@ -231,7 +231,7 @@ LifecycleManager::pause()
return false;
}
message("Managed nodes have been paused");
system_active_ = false;
system_active_ = false;
return true;
}
......@@ -244,7 +244,7 @@ LifecycleManager::resume()
return false;
}
message("Managed nodes are active");
system_active_ = true;
system_active_ = true;
return true;
}
......
......@@ -60,6 +60,7 @@ Nav2Panel::Nav2Panel(QWidget * parent)
idle_->setObjectName("idle");
idle_->assignProperty(start_stop_button_, "text", "Shutdown");
idle_->assignProperty(start_stop_button_, "toolTip", shutdown_msg);
idle_->assignProperty(start_stop_button_, "enabled", true);
// State entered after NavigateToPose has been canceled
canceled_ = new QState();
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment