X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLyX.cpp;h=4e97f7ae64b92286ef5aa0a3152349942c1f2e32;hb=1b6ce0e827d58258e84ba2bf0754c6b273b123db;hp=0e1b19faf664f849a37f6add26f620fbad54e2d8;hpb=efc9720b0d5315cb4d5ab3eac4d2cbbebc392ac8;p=lyx.git

diff --git a/src/LyX.cpp b/src/LyX.cpp
index 0e1b19faf6..4e97f7ae64 100644
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -471,45 +471,39 @@ void LyX::earlyExit(int status)
 
 int LyX::init(int & argc, char * argv[])
 {
-	try {
-		// check for any spurious extra arguments
-		// other than documents
-		for (int argi = 1; argi < argc ; ++argi) {
-			if (argv[argi][0] == '-') {
-				lyxerr << to_utf8(
-					bformat(_("Wrong command line option `%1$s'. Exiting."),
-							from_utf8(os::utf8_argv(argi)))) << endl;
-				return EXIT_FAILURE;
-			}
-		}
-
-		// Initialization of LyX (reads lyxrc and more)
-		LYXERR(Debug::INIT, "Initializing LyX::init...");
-		bool success = init();
-		LYXERR(Debug::INIT, "Initializing LyX::init...done");
-		if (!success)
-			return EXIT_FAILURE;
-		// Remaining arguments are assumed to be files to load.
-		for (int argi = 1; argi < argc; ++argi)
-			pimpl_->files_to_load_.push_back(os::utf8_argv(argi));
-
-		if (!use_gui && pimpl_->files_to_load_.empty()) {
-			lyxerr << to_utf8(_("Missing filename for this operation.")) << endl;
+	// check for any spurious extra arguments
+	// other than documents
+	for (int argi = 1; argi < argc ; ++argi) {
+		if (argv[argi][0] == '-') {
+			lyxerr << to_utf8(
+				bformat(_("Wrong command line option `%1$s'. Exiting."),
+				from_utf8(os::utf8_argv(argi)))) << endl;
 			return EXIT_FAILURE;
 		}
+	}
 
-		if (first_start) {
-			pimpl_->files_to_load_.push_back(
-				i18nLibFileSearch("examples", "splash.lyx").absFileName());
-		}
+	// Initialization of LyX (reads lyxrc and more)
+	LYXERR(Debug::INIT, "Initializing LyX::init...");
+	bool success = init();
+	LYXERR(Debug::INIT, "Initializing LyX::init...done");
+	if (!success)
+		return EXIT_FAILURE;
 
-		return EXIT_SUCCESS;
+	// Remaining arguments are assumed to be files to load.
+	for (int argi = 1; argi < argc; ++argi)
+		pimpl_->files_to_load_.push_back(os::utf8_argv(argi));
 
-	} catch (exception const &e) {
-		// This can happen _in_theory_ in replaceEnvironmentPath
-		lyxerr << "Caught exception `" << e.what() << "'." << endl;
+	if (!use_gui && pimpl_->files_to_load_.empty()) {
+		lyxerr << to_utf8(_("Missing filename for this operation.")) << endl;
 		return EXIT_FAILURE;
 	}
+
+	if (first_start) {
+		pimpl_->files_to_load_.push_back(
+			i18nLibFileSearch("examples", "splash.lyx").absFileName());
+	}
+
+	return EXIT_SUCCESS;
 }