anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 13:31:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't start the gui if it was not requested (fixes a crash)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9956 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2005-05-19 09:44:20 +00:00
parent 65f9fc786e
commit aa597ebc0d
2 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/ChangeLog
View File

@ -1,3 +1,9 @@
2005-05-18 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* lyx_main.C (priv_exec): fix logic error with help from Angus
* lyx_main.C (parse_execute): set is_gui = false and remove now
obsolete comment about a segfault
2005-05-18 Angus Leeming <leeming@lyx.org>
* buffer.C (readFile): Quote all file names passed to lyx2lyx.

12
src/lyx_main.C
View File

@ -278,7 +278,13 @@ void LyX::priv_exec(int & argc, char * argv[])
files.clear(); // the files are already loaded
}
lyx_gui::start(batch_command, files);
if (want_gui)
lyx_gui::start(batch_command, files);
else {
// Something went wrong above
QuitLyX();
exit(EXIT_FAILURE);
}
}
@ -879,9 +885,7 @@ int parse_execute(string const & arg, string const &)
exit(1);
}
batch = arg;
// Argh. Setting gui to false segfaults..
// FIXME: when ? how ?
// is_gui = false;
is_gui = false;
return 1;
}