The branch, master, has been updated. - Log -----------------------------------------------------------------
commit 85b3db19af47d9696952647f1a98aaae0729efd5 Author: Georg Baum <[email protected]> Date: Sun Apr 21 21:32:53 2013 +0200 Fix bug #8636 This was a simple logic error that crept in during refactoring: If the format does not match, and the converted file has been read, the string must not be read. diff --git a/src/Buffer.cpp b/src/Buffer.cpp index 1d9061c..01a72f2 100644 --- a/src/Buffer.cpp +++ b/src/Buffer.cpp @@ -1043,8 +1043,7 @@ bool Buffer::readString(string const & s) if (readFile(fn) != ReadSuccess) success = false; } - - if (success) + else if (success) if (readDocument(lex)) success = false; if (fn.exists()) ----------------------------------------------------------------------- Summary of changes: src/Buffer.cpp | 3 +-- 1 files changed, 1 insertions(+), 2 deletions(-) hooks/post-receive -- The LyX Source Repository
