Merge branch 'bug813' of https://github.com/vorenon/openmw into bug813

12 years ago · b97a051dc6
parent 3e29506d5c 9ac4a9c5eb
commit b97a051dc6
1 changed files with 2 additions and 2 deletions
--- a/apps/openmw/main.cpp
+++ b/apps/openmw/main.cpp
@ -217,8 +217,8 @@ bool parseOptions (int argc, char** argv, OMW::Engine& engine, Files::Configurat
    StringsVector master = variables["master"].as<StringsVector>();
    if (master.empty())
    {
-        std::cout << "No master file given. Assuming Morrowind.esm" << std::endl;
-        master.push_back("Morrowind");
+        std::cout << "No master file given. Aborting...\n";
+        std::exit(1);
    }

    StringsVector plugin = variables["plugin"].as<StringsVector>();