anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 19:14:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix MacOS crash on startus

Browse Source 
* LyX::execBatchCommands(): allow any extra argument unknown to the core to be passed out to the frontend.



git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16014 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2006-11-23 15:18:09 +00:00
parent 70cf0c49ab
commit 3e40bf3dbf
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/lyx_main.C
View File

@ -425,17 +425,6 @@ void LyX::quit()
int LyX::execBatchCommands(int & argc, char * argv[], int LyX::execBatchCommands(int & argc, char * argv[],
vector<string> & files) vector<string> & files)
{ {
// 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(argv[argi]))) << endl;
return EXIT_FAILURE;
}
}
// Initialization of LyX (reads lyxrc and more) // Initialization of LyX (reads lyxrc and more)
lyxerr[Debug::INIT] << "Initializing LyX::init..." << endl; lyxerr[Debug::INIT] << "Initializing LyX::init..." << endl;
bool success = init(); bool success = init();
@ -443,8 +432,14 @@ int LyX::execBatchCommands(int & argc, char * argv[],
if (!success) if (!success)
return EXIT_FAILURE; return EXIT_FAILURE;
for (int argi = argc - 1; argi >= 1; --argi) for (int argi = argc - 1; argi >= 1; --argi) {
// check for any remaining extra arguments other than
// document file names. These will be passed out to the
// frontend.
if (argv[argi][0] == '-')
continue;
files.push_back(os::internal_path(argv[argi])); files.push_back(os::internal_path(argv[argi]));
}
if (first_start) if (first_start)
files.push_back(i18nLibFileSearch("examples", "splash.lyx")); files.push_back(i18nLibFileSearch("examples", "splash.lyx"));