From cf42cfab16dbb20745ef713610fb1bd64fce89f4 Mon Sep 17 00:00:00 2001 From: jmt Date: Fri, 26 Dec 2008 15:33:38 +0000 Subject: [PATCH] Fix up environment code for threading-enabled case, d'oh. --- src/Environment/environment_ctrl.cxx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/Environment/environment_ctrl.cxx b/src/Environment/environment_ctrl.cxx index 8fb0ad8fe..1331a2c32 100644 --- a/src/Environment/environment_ctrl.cxx +++ b/src/Environment/environment_ctrl.cxx @@ -964,7 +964,7 @@ FGMetarEnvironmentCtrl::update_metar_properties( const FGMetar *m ) void FGMetarEnvironmentCtrl::thread_stop() { - request_queue.push( string() ); // ask thread to terminate + request_queue.push(NULL); // ask thread to terminate thread->join(); } @@ -973,11 +973,11 @@ FGMetarEnvironmentCtrl::MetarThread::run() { while ( true ) { - string icao = fetcher->request_queue.pop(); - if (icao.empty()) + FGAirport* apt = fetcher->request_queue.pop(); + if (!apt) return; - SG_LOG( SG_GENERAL, SG_INFO, "Thread: fetch metar data = " << icao ); - FGMetarResult result = fetcher->fetch_data( icao ); + SG_LOG( SG_GENERAL, SG_INFO, "Thread: fetch metar data = " << apt->ident() ); + FGMetarResult result = fetcher->fetch_data( apt ); fetcher->result_queue.push( result ); } } -- 2.39.5