diff options
| author | Paul Gilbert | 2016-03-20 14:55:41 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-03-20 14:55:41 -0400 |
| commit | 3c852cc240221785598023de56e5a71a0d8806fa (patch) | |
| tree | c2a64b811586e4e9d8a4d5baa04d5c4f9d23bd08 /base/commandLine.cpp | |
| parent | ea54e6244e75c609e6886ba210f80fb22c479d3f (diff) | |
| parent | 509a00109e79156e91c062f145ac3aa86ec8584e (diff) | |
| download | scummvm-rg350-3c852cc240221785598023de56e5a71a0d8806fa.tar.gz scummvm-rg350-3c852cc240221785598023de56e5a71a0d8806fa.tar.bz2 scummvm-rg350-3c852cc240221785598023de56e5a71a0d8806fa.zip | |
Merge branch 'master' into titanic
Diffstat (limited to 'base/commandLine.cpp')
| -rw-r--r-- | base/commandLine.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/base/commandLine.cpp b/base/commandLine.cpp index 19702ea36d..105d810460 100644 --- a/base/commandLine.cpp +++ b/base/commandLine.cpp @@ -373,6 +373,12 @@ Common::String parseCommandLine(Common::StringMap &settings, int argc, const cha // We defer checking whether this is a valid target to a later point. return s; } else { + // On MacOS X prior to 10.9 the OS is sometimes adding a -psn_X_XXXXXX argument (where X are digits) + // to pass the process serial number. We need to ignore it to avoid an error. +#ifdef MACOSX + if (strncmp(s, "-psn_", 5) == 0) + continue; +#endif bool isLongCmd = (s[0] == '-' && s[1] == '-'); |