Switch from bool to int for more deterministic structure packing.

[flightgear.git] / src / Network / ATC-Inputs.cxx

diff --git a/src/Network/ATC-Inputs.cxx b/src/Network/ATC-Inputs.cxx
index 16817743e2c076a41a1ae637c5e9d7c74a4764c1..d8e6a551e7d60236bcd83f3955d27e7fe7f8479d 100644 (file)
--- a/src/Network/ATC-Inputs.cxx
+++ b/src/Network/ATC-Inputs.cxx
@@ -136,11 +136,14 @@ bool FGATCInput::open() {
     init_config();
 
     SG_LOG( SG_IO, SG_ALERT,
-           "Initializing ATC hardware, please wait ..." );
+           "Initializing ATC input hardware, please wait ..." );
 
-    snprintf( analog_in_file, 256, "/proc/atc610x/board%d/analog_in", board );
-    snprintf( radios_file, 256, "/proc/atc610x/board%d/radios", board );
-    snprintf( switches_file, 256, "/proc/atc610x/board%d/switches", board );
+    snprintf( analog_in_file, 256,
+              "/proc/atcflightsim/board%d/analog_in", board );
+    snprintf( radios_file, 256,
+              "/proc/atcflightsim/board%d/radios", board );
+    snprintf( switches_file, 256,
+              "/proc/atcflightsim/board%d/switches", board );
 
 #if defined( unix ) || defined( __CYGWIN__ )
 
@@ -182,7 +185,7 @@ bool FGATCInput::open() {
     /////////////////////////////////////////////////////////////////////
 
     SG_LOG( SG_IO, SG_ALERT,
-           "Done initializing ATC hardware." );
+           "Done initializing ATC input hardware." );
 
     is_open = true;
 
@@ -859,6 +862,10 @@ bool FGATCInput::close() {
 
 #if defined( unix ) || defined( __CYGWIN__ )
 
+    if ( !is_open ) {
+        return true;
+    }
+
     int result;
 
     result = ::close( analog_in_fd );