Merge branch 'next' of gitorious.org:fg/flightgear into next

[flightgear.git] / src / ATC / atcdialog.cxx

diff --git a/src/ATC/atcdialog.cxx b/src/ATC/atcdialog.cxx
index eb9533fbb692726b6d5b6aba720e5b75cff56635..d2aad836e25e78c93be1381d191f77fb938d160a 100644 (file)
--- a/src/ATC/atcdialog.cxx
+++ b/src/ATC/atcdialog.cxx
@@ -35,11 +35,12 @@
 
 FGATCDialogNew *currentATCDialog;
 
-static bool doATCDialog(const SGPropertyNode* arg) {
+/*static bool doATCDialog(const SGPropertyNode* arg) {
         //cerr << "Running doATCDialog" << endl;
        currentATCDialog->PopupDialog();
        return(true);
-}
+}*/
+FGATCDialogNew * FGATCDialogNew::_instance = NULL;
 
 FGATCDialogNew::FGATCDialogNew()
 {
@@ -54,7 +55,7 @@ FGATCDialogNew::~FGATCDialogNew()
 
 void FGATCDialogNew::init() {
        // Add ATC-dialog to the command list
-       globals->get_commands()->addCommand("ATC-dialog", doATCDialog);
+    globals->get_commands()->addCommand("ATC-dialog", FGATCDialogNew::popup );
        // Add ATC-freq-search to the command list
        //globals->get_commands()->addCommand("ATC-freq-search", do_ATC_freq_search);