From 577619aaab39a21648a17ca48116ed7730e26e84 Mon Sep 17 00:00:00 2001
From: Vivian Meazza <vivian.meazza@lineone.net>
Date: Wed, 22 Dec 2010 21:49:20 +0000
Subject: [PATCH 1/2] Merge branch 'Work' of \New Git\fgdata


From c41e11e80b8aa0b7cf88859e0c24c6444443a885 Mon Sep 17 00:00:00 2001
From: Torsten Dreyer <Torsten@t3r.de>
Date: Wed, 22 Dec 2010 22:54:49 +0100
Subject: [PATCH 2/2] bugfix: enable globalwx METAR textfield on --metar

The METAR input field is now enabled when the global weather
dialog is opened and fg was started with --metar=something
---
 gui/dialogs/weather.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gui/dialogs/weather.xml b/gui/dialogs/weather.xml
index 67189022b..17b17ac11 100644
--- a/gui/dialogs/weather.xml
+++ b/gui/dialogs/weather.xml
@@ -1601,7 +1601,7 @@
               combo.getChild("value", i, 1).setValue(scenarios[i].getNode("name").getValue());
           }
 
-          me.scenarioListenerId = setlistener( me.base ~ "/source-selection", func(n) { me.scenarioListener(n); } );
+          me.scenarioListenerId = setlistener( me.base ~ "/source-selection", func(n) { me.scenarioListener(n); }, 1, 1 );
           me.metarListenerId = setlistener( "environment/metar/valid", func(n) { me.metarListener(n); }, 1, 1 );
         },