anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 03:11:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git.lyx.org:lyx

Browse Source
This commit is contained in:
Uwe Stöhr 2018-01-29 15:10:13 +01:00
commit 46037ea583
1 changed files with 28 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/LyX.cpp
View File

@ -471,6 +471,7 @@ void LyX::earlyExit(int status)
int LyX::init(int & argc, char * argv[]) int LyX::init(int & argc, char * argv[])
{ {
try {
// check for any spurious extra arguments // check for any spurious extra arguments
// other than documents // other than documents
for (int argi = 1; argi < argc ; ++argi) { for (int argi = 1; argi < argc ; ++argi) {
@ -483,17 +484,11 @@ int LyX::init(int & argc, char * argv[])
} }
// Initialization of LyX (reads lyxrc and more) // Initialization of LyX (reads lyxrc and more)
try {
LYXERR(Debug::INIT, "Initializing LyX::init..."); LYXERR(Debug::INIT, "Initializing LyX::init...");
bool success = init(); bool success = init();
LYXERR(Debug::INIT, "Initializing LyX::init...done"); LYXERR(Debug::INIT, "Initializing LyX::init...done");
if (!success) if (!success)
return EXIT_FAILURE; return EXIT_FAILURE;
} catch (exception const &e) {
// This can happen _in_theory_ in replaceEnvironmentPath
lyxerr << "Caught exception `" << e.what() << "'." << endl;
return EXIT_FAILURE;
}
// Remaining arguments are assumed to be files to load. // Remaining arguments are assumed to be files to load.
for (int argi = 1; argi < argc; ++argi) for (int argi = 1; argi < argc; ++argi)
pimpl_->files_to_load_.push_back(os::utf8_argv(argi)); pimpl_->files_to_load_.push_back(os::utf8_argv(argi));
@ -509,6 +504,12 @@ int LyX::init(int & argc, char * argv[])
} }
return EXIT_SUCCESS; return EXIT_SUCCESS;
} catch (exception const &e) {
// This can happen _in_theory_ in replaceEnvironmentPath
lyxerr << "Caught exception `" << e.what() << "'." << endl;
return EXIT_FAILURE;
}
} }