From 9c55acfb46a16c226c4ecf4481877180f19a483f Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Sat, 25 Jun 2011 19:23:53 +0200
Subject: [PATCH 1/2] #351: fix listener sequence for local weather Module
 relied on one listener to be called before the other. Join listeners to avoid
 dependencies.

---
 Nasal/local_weather/compat_layer.nas  | 5 +++++
 Nasal/local_weather/local_weather.nas | 6 ------
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Nasal/local_weather/compat_layer.nas b/Nasal/local_weather/compat_layer.nas
index e2af36f4c..5136624d3 100644
--- a/Nasal/local_weather/compat_layer.nas
+++ b/Nasal/local_weather/compat_layer.nas
@@ -119,6 +119,11 @@ print("* can disable global weather:      "~result);
 
 
 print("Compatibility layer: tests done.");
+
+# do actual startup()
+local_weather.updateMenu();
+local_weather.startup();
+
 });
 
 
diff --git a/Nasal/local_weather/local_weather.nas b/Nasal/local_weather/local_weather.nas
index 4934603b3..7004013c3 100644
--- a/Nasal/local_weather/local_weather.nas
+++ b/Nasal/local_weather/local_weather.nas
@@ -4621,10 +4621,4 @@ var updateMenu = func {
 
 _setlistener("/nasal/local_weather/enabled", updateMenu);
 
-# wait for Nasal to be available and do what is in startup()
-
-_setlistener("/nasal/local_weather/loaded", func {
-	updateMenu();
-	startup();
-});
 

From e4aed318d0e2e924a40cd489d333faa3e45dfc8d Mon Sep 17 00:00:00 2001
From: ThorstenB <brehmt@gmail.com>
Date: Sun, 26 Jun 2011 16:18:17 +0200
Subject: [PATCH 2/2] #358: Missing option to disable AI scenarios Introduce
 --disable-ai-scenarios option to disable all scenarios (can be used by
 external launchers, GUIs etc)

---
 Translations/strings-default.xml |  1 +
 options.xml                      | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Translations/strings-default.xml b/Translations/strings-default.xml
index 8a444eb75..ab9cbae72 100644
--- a/Translations/strings-default.xml
+++ b/Translations/strings-default.xml
@@ -100,6 +100,7 @@
  <enable-ai-models-desc>Enable AI subsystem (required for multi-player, AI traffic and many other animations)</enable-ai-models-desc>
  <disable-ai-traffic-desc>Disable artificial traffic.</disable-ai-traffic-desc>
  <enable-ai-traffic-desc>Enable artificial traffic.</enable-ai-traffic-desc>
+ <disable-ai-scenarios>Disable all AI scenarios.</disable-ai-scenarios>
  <ai-scenario>Add and enable a new scenario. Multiple options are allowed.</ai-scenario>
  <disable-freeze-desc>Start in a running state</disable-freeze-desc>
  <enable-freeze-desc>Start in a frozen state</enable-freeze-desc>
diff --git a/options.xml b/options.xml
index 8d12e210e..4302b6421 100644
--- a/options.xml
+++ b/options.xml
@@ -78,11 +78,11 @@
    </option>
 
    <option>
-       <name>fg-aircraft</name>
-       <arg>path</arg>
-       <description>strings/fg-aircraft-desc</description>
-       <brief/>
-      </option>
+    <name>fg-aircraft</name>
+    <arg>path</arg>
+    <description>strings/fg-aircraft-desc</description>
+    <brief/>
+   </option>
 
    <option>
     <name>language</name>
@@ -232,6 +232,11 @@
     <description>strings/enable-ai-traffic-desc</description>
    </option>
 
+   <option>
+    <name>disable-ai-scenarios</name>
+    <description>strings/disable-ai-scenarios</description>
+   </option>
+
    <option>
     <name>ai-scenario</name>
     <arg>scenario</arg>