Don't restore initial screen geometry because there is nothing in fg_os* to resize...

[flightgear.git] / src / Environment / environment_ctrl.hxx

diff --git a/src/Environment/environment_ctrl.hxx b/src/Environment/environment_ctrl.hxx
index 879c902bb48669d0c47490a25aea84a579183801..aee0a368bbf75b54ca5f81c1b2e055ff80f731e8 100644 (file)
--- a/src/Environment/environment_ctrl.hxx
+++ b/src/Environment/environment_ctrl.hxx
@@ -16,7 +16,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -194,7 +194,7 @@ private:
     /**
      * FIFO queue which holds a pointer to the fetched metar data.
      */
-    SGBlockingQueue < FGMetarResult > result_queue;
+    SGLockedQueue < FGMetarResult > result_queue;
 #else
     /**
      * FIFO queue which holds a pointer to the fetched metar data.
@@ -240,17 +240,7 @@ private:
      */
     MetarThread* thread;
 
-    /**
-     * Lock and synchronize access to metar queue.
-     */
-    SGMutex mutex;
-    SGPthreadCond metar_cond;
-
-    /**
-     * Thread cleanup handler.
-     */
-    friend void metar_cleanup_handler( void* );
-
+    void thread_stop();
 #endif // ENABLE_THREADS
 
     int _error_count;