Adjust subsystem order (instruments vs systems)

[flightgear.git] / src / Main / fg_io.cxx

diff --git a/src/Main/fg_io.cxx b/src/Main/fg_io.cxx
index 2014212b5faeea942061604d8a30bafc5987e263..96b2a4d6b27ad2477a5e5cccf5d6d34e3febc9a5 100644 (file)
--- a/src/Main/fg_io.cxx
+++ b/src/Main/fg_io.cxx
@@ -196,24 +196,16 @@ FGIO::parse_port_config( const string& config )
        } else if ( protocol == "rul" ) {
            FGRUL *rul = new FGRUL;
            io = rul;
-        } else if ( protocol == "generic" ) {
-            size_t configToken;
-            if (tokens[1] == "socket") {
-                configToken = 7;
-            } else if (tokens[1] == "file") {
-                configToken = 5;
-            } else {
-                configToken = 6;
-            }
-
-            if (configToken >= tokens.size()) {
-                SG_LOG( SG_IO, SG_ALERT, "Not enough tokens passed for the generic protocol.");
-                return NULL;
-            }
-
-            FGGeneric *generic = new FGGeneric( tokens );
-            io = generic;
-       } else if ( protocol == "multiplay" ) {
+    } else if ( protocol == "generic" ) {
+        FGGeneric *generic = new FGGeneric( tokens );
+        if (!generic->getInitOk())
+        {
+            // failed to initialize (i.e. invalid configuration)
+            delete generic;
+            return NULL;
+        }
+        io = generic;
+    } else if ( protocol == "multiplay" ) {
            if ( tokens.size() != 5 ) {
                SG_LOG( SG_IO, SG_ALERT, "Ignoring invalid --multiplay option "
                        "(4 arguments expected: --multiplay=dir,hz,hostname,port)" );