anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-05 08:57:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #7553 (Crash on latex import, also on html import)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@38734 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2011-05-12 23:08:50 +00:00
parent eef204ca33
commit 129e00aa24
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Converter.cpp
View File

@ -307,7 +307,8 @@ bool Converters::convert(Buffer const * buffer,
LYXERR(Debug::FILES, "No converter defined! " LYXERR(Debug::FILES, "No converter defined! "
"I use convertDefault.py:\n\t" << command); "I use convertDefault.py:\n\t" << command);
Systemcall one; Systemcall one;
one.startscript(Systemcall::Wait, command, buffer->filePath()); one.startscript(Systemcall::Wait, command, buffer ?
buffer->filePath() : string());
if (to_file.isReadableFile()) { if (to_file.isReadableFile()) {
if (conversionflags & try_cache) if (conversionflags & try_cache)
ConverterCache::get().add(orig_from, ConverterCache::get().add(orig_from,
@ -444,13 +445,14 @@ bool Converters::convert(Buffer const * buffer,
if (dummy) { if (dummy) {
res = one.startscript(Systemcall::DontWait, res = one.startscript(Systemcall::DontWait,
to_filesystem8bit(from_utf8(command)), to_filesystem8bit(from_utf8(command)),
buffer->filePath()); buffer ? buffer->filePath() : string());
// We're not waiting for the result, so we can't do anything // We're not waiting for the result, so we can't do anything
// else here. // else here.
} else { } else {
res = one.startscript(Systemcall::Wait, res = one.startscript(Systemcall::Wait,
to_filesystem8bit(from_utf8(command)), to_filesystem8bit(from_utf8(command)),
buffer->filePath()); buffer ? buffer->filePath()
: string());
if (!real_outfile.empty()) { if (!real_outfile.empty()) {
Mover const & mover = getMover(conv.to); Mover const & mover = getMover(conv.to);
if (!mover.rename(outfile, real_outfile)) if (!mover.rename(outfile, real_outfile))