From e01482a5de25dcfef1d36661238e78f6b196200e Mon Sep 17 00:00:00 2001 From: Pascal Brisset Date: Mon, 13 Mar 2006 12:55:17 +0000 Subject: [PATCH] -ref and -m options no longer exclusive --- sw/ground_segment/cockpit/map2d.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sw/ground_segment/cockpit/map2d.ml b/sw/ground_segment/cockpit/map2d.ml index cd7c9586aa..94b19fcddb 100644 --- a/sw/ground_segment/cockpit/map2d.ml +++ b/sw/ground_segment/cockpit/map2d.ml @@ -724,8 +724,8 @@ let _ = (* Loading an initial map *) if !geo_ref <> "" then - set_georef_if_none geomap (Latlong.of_string !geo_ref) - else if !map_file <> "" then begin + set_georef_if_none geomap (Latlong.of_string !geo_ref); + if !map_file <> "" then begin let xml_map_file = if !map_file.[0] <> '/' then Filename.concat default_path_maps !map_file else !map_file in display_map geomap xml_map_file end;