Avoid negative values of wait_time

[r2c2.git] / source / engineer / options.cpp

diff --git a/source/engineer/options.cpp b/source/engineer/options.cpp
index 9861c10e7e6230f282f8f1f4aaa6159c0e3d76c5..89e1fd109be155a3172aa488afc2619bf89d42fe 100644 (file)
--- a/source/engineer/options.cpp
+++ b/source/engineer/options.cpp
@@ -1,11 +1,5 @@
-/* $Id$
-
-This file is part of the MSP Märklin suite
-Copyright © 2010  Mikkosoft Productions, Mikko Rasa
-Distributed under the GPL
-*/
-
 #include <msp/core/getopt.h>
+#include <msp/fs/utils.h>
 #include <msp/strings/lexicalcast.h>
 #include <msp/strings/regex.h>
 #include "options.h"
@@ -30,6 +24,7 @@ Options::Options(int argc, char **argv):
        getopt.add_option('d', "driver",      driver,      GetOpt::REQUIRED_ARG);
        getopt.add_option('s', "simulate",    simulate,    GetOpt::NO_ARG);
        getopt.add_option('n', "network",     network,     GetOpt::NO_ARG);
+       getopt.add_option(     "state",       state_fn,    GetOpt::REQUIRED_ARG);
        getopt(argc, argv);
 
        if(!res.empty())
@@ -40,12 +35,15 @@ Options::Options(int argc, char **argv):
                        screen_h = lexical_cast<unsigned>(m[2].str);
                }
                else
-                       throw UsageError("Invalid resolution");
+                       throw usage_error("Invalid resolution");
        }
 
        const vector<string> &args = getopt.get_args();
        if(args.empty())
-               throw UsageError("No layout given");
+               throw usage_error("No layout given");
 
        layout_fn = args[0];
+
+       if(state_fn.empty())
+               state_fn = FS::basepart(layout_fn)+".state";
 }