On 05/12/2011 07:08 PM, for...@lyx.org wrote:
> Author: forenr
> Date: Fri May 13 01:08:50 2011
> New Revision: 38734
> URL: http://www.lyx.org/trac/changeset/38734
>
> Log:
> Fix bug #7553 (Crash on latex import, also on html import)
>
Looks good for branch. Thanks....
rh
> Modified:
> lyx-devel/trunk/src/Converter.cpp
>
> Modified: lyx-devel/trunk/src/Converter.cpp
> ==============================================================================
> --- lyx-devel/trunk/src/Converter.cpp Fri May 13 00:06:06 2011 (r38733)
> +++ lyx-devel/trunk/src/Converter.cpp Fri May 13 01:08:50 2011 (r38734)
> @@ -307,7 +307,8 @@
> LYXERR(Debug::FILES, "No converter defined! "
> "I use convertDefault.py:\n\t" << command);
> Systemcall one;
> - one.startscript(Systemcall::Wait, command,
> buffer->filePath());
> + one.startscript(Systemcall::Wait, command, buffer ?
> + buffer->filePath() : string());
> if (to_file.isReadableFile()) {
> if (conversionflags & try_cache)
> ConverterCache::get().add(orig_from,
> @@ -444,13 +445,14 @@
> if (dummy) {
> res = one.startscript(Systemcall::DontWait,
> to_filesystem8bit(from_utf8(command)),
> - buffer->filePath());
> + buffer ? buffer->filePath() : string());
> // We're not waiting for the result, so we
> can't do anything
> // else here.
> } else {
> res = one.startscript(Systemcall::Wait,
>
> to_filesystem8bit(from_utf8(command)),
> - buffer->filePath());
> + buffer ? buffer->filePath()
> + : string());
> if (!real_outfile.empty()) {
> Mover const & mover = getMover(conv.to);
> if (!mover.rename(outfile,
> real_outfile))
