From: Georg Baum <baum@lyx.org>
Date: Sun, 21 Apr 2013 19:32:53 +0000 (+0200)
Subject: Fix bug #8636
X-Git-Tag: 2.1.0beta1~366
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=85b3db19af47d9696952647f1a98aaae0729efd5;p=features.git

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 1d9061ce77..01a72f2879 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())