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

[lyx.git] / src / LyX.cpp

diff --git a/src/LyX.cpp b/src/LyX.cpp
index b7b1edf91520e86ff4646fcfbe54c741ea2cef60..66ff6f3dbed227559ab8d99e98aa4ed038bc8a79 100644 (file)
--- a/src/LyX.cpp
+++ b/src/LyX.cpp
@@ -490,14 +490,15 @@ int LyX::execWithoutGui(int & argc, char * argv[])
 
                Buffer * buf = pimpl_->buffer_list_.newBuffer(fname.absFileName());
                LYXERR(Debug::FILES, "Loading " << fname);
-               if (buf->loadLyXFile() == Buffer::ReadSuccess) {
+               if (buf && buf->loadLyXFile() == Buffer::ReadSuccess) {
                        ErrorList const & el = buf->errorList("Parse");
                        if (!el.empty())
                                        for_each(el.begin(), el.end(),
                                                                         bind(&LyX::printError, this, _1));
                        command_line_buffers.push_back(buf);
                } else {
-                       pimpl_->buffer_list_.release(buf);
+                       if (buf)
+                               pimpl_->buffer_list_.release(buf);
                        docstring const error_message =
                                        bformat(_("LyX failed to load the following file: %1$s"),
                                                                        from_utf8(fname.absFileName()));