Merge commit 'refs/merge-requests/14' of git://gitorious.org/fg/flightgear into next

[flightgear.git] / src / Instrumentation / KLN89 / kln89_page_ndb.cxx

diff --git a/src/Instrumentation/KLN89/kln89_page_ndb.cxx b/src/Instrumentation/KLN89/kln89_page_ndb.cxx
index 07e4a838555579303a66b74a13a22431d5fb8c50..c6ba4bb0eee145d0b967bdd181e678751ee25865 100644 (file)
--- a/src/Instrumentation/KLN89/kln89_page_ndb.cxx
+++ b/src/Instrumentation/KLN89/kln89_page_ndb.cxx
@@ -3,7 +3,7 @@
 //
 // Written by David Luff, started 2005.
 //
-// Copyright (C) 2005 - David C Luff - david.luff@nottingham.ac.uk
+// Copyright (C) 2005 - David C Luff - daveluff AT ntlworld.com
 //
 // This program is free software; you can redistribute it and/or
 // modify it under the terms of the GNU General Public License as
@@ -26,6 +26,7 @@
 #endif
 
 #include "kln89_page_ndb.hxx"
+#include <Navaids/navrecord.hxx>
 
 KLN89NDBPage::KLN89NDBPage(KLN89* parent) 
 : KLN89Page(parent) {
@@ -89,7 +90,7 @@ void KLN89NDBPage::Update(double dt) {
                }
                if(_subPage == 0) {
                        // TODO - trim VOR-DME from the name, convert to uppercase, abbreviate, etc
-                       _kln89->DrawText(np->get_name(), 2, 0, 2);
+                       _kln89->DrawText(np->name(), 2, 0, 2);
                        _kln89->DrawLatitude(np->get_lat(), 2, 3, 1);
                        _kln89->DrawLongitude(np->get_lon(), 2, 3, 0);
                } else {
@@ -157,8 +158,12 @@ void KLN89NDBPage::ClrPressed() {
 void KLN89NDBPage::EntPressed() {
        if(_entInvert) {
                _entInvert = false;
-               _last_ndb_id = _ndb_id;
-               _ndb_id = _save_ndb_id;
+               if(_kln89->_dtoReview) {
+                       _kln89->DtoInitiate(_ndb_id);
+               } else {
+                       _last_ndb_id = _ndb_id;
+                       _ndb_id = _save_ndb_id;
+               }
        }
 }