From 1a7535803415d1b7219c0764896374f686cfa3a8 Mon Sep 17 00:00:00 2001
From: Felix Ruess <felix.ruess@gmail.com>
Date: Sun, 13 Sep 2015 11:19:04 +0200
Subject: [PATCH] [flight plans] require deroute for exceptions

---
 sw/tools/generators/gen_flight_plan.ml | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/sw/tools/generators/gen_flight_plan.ml b/sw/tools/generators/gen_flight_plan.ml
index b09ff8cf141..699eece507a 100644
--- a/sw/tools/generators/gen_flight_plan.ml
+++ b/sw/tools/generators/gen_flight_plan.ml
@@ -158,13 +158,16 @@ let get_index_block = fun x ->
 
 let print_exception = fun x ->
   let c = parsed_attrib x "cond" in
+  begin
   try
-    let i = get_index_block (ExtXml.attrib x "deroute") in
-    lprintf "if ((nav_block != %d) && %s) { GotoBlock(%d); return; }\n" i c i
-  with
-    ExtXml.Error _ ->
     let f =  ExtXml.attrib x "exec" in
-    lprintf "if (%s) { %s; return; }\n" c f
+    lprintf "if (%s) { %s; }\n" c f
+  with
+    ExtXml.Error _ -> ()
+  end;
+  let i = get_index_block (ExtXml.attrib x "deroute") in
+  lprintf "if ((nav_block != %d) && %s) { GotoBlock(%d); return; }\n" i c i
+
 
 let element = fun a b c -> Xml.Element (a, b, c)
 let goto l = element "goto" ["name",l] []