From 563871afdc06e5e917fe7b92d6f4745903cd4400 Mon Sep 17 00:00:00 2001
From: Erik Andresen <erik@vontaene.de>
Date: Tue, 22 Sep 2015 19:46:02 +0200
Subject: [PATCH] move_base: don't launch mapserver if nomap is set

---
 launch/move_base.launch | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/launch/move_base.launch b/launch/move_base.launch
index 441dbea..ad30795 100644
--- a/launch/move_base.launch
+++ b/launch/move_base.launch
@@ -4,11 +4,11 @@
 	<arg name="map_file" default="$(find wild_thumper)/data/map.yaml" />
 	<arg name="nomap" default="false" />
 
-	<!-- Run the map server -->
-	<node name="map_server" pkg="map_server" type="map_server" args="$(arg map_file)" unless="$(arg slam_gmapping)" />
-
 	<!-- Run AMCL -->
 	<group unless="$(arg nomap)">
+		<!-- Run the map server -->
+		<node name="map_server" pkg="map_server" type="map_server" args="$(arg map_file)" unless="$(arg slam_gmapping)" />
+
 		<include file="$(find amcl)/examples/amcl_diff.launch" unless="$(arg slam_gmapping)" />
 		<param name="amcl/base_frame_id" value="base_footprint" />
 	</group>
-- 
2.39.5