X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBuffer.cpp;h=888fb93d9b16a7dbc19f0186b02ed28e3c730f01;hb=2104d41f71ff39f5c3f9f5a485707633b1bfb25b;hp=a64e4b68eafcdc969deebbf4382e0bc40eee9b43;hpb=670efa8f646218f2a378f0cc614c4c37a9f6b89a;p=lyx.git

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index a64e4b68ea..888fb93d9b 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -4315,26 +4315,22 @@ Buffer::ExportStatus Buffer::preview(string const & format, bool includeall) con
 	ExportStatus const status = doExport(format, true, false, result_file);
 	FileName const previewFile(result_file);
 
-	LATTEST (isClone());
-	d->cloned_buffer_->d->preview_file_ = previewFile;
-	d->cloned_buffer_->d->preview_format_ = format;
-	d->cloned_buffer_->d->preview_error_ = (status != ExportSuccess);
+	Impl * theimpl = isClone() ? d->cloned_buffer_->d : d;
+	theimpl->preview_file_ = previewFile;
+	theimpl->preview_format_ = format;
+	theimpl->preview_error_ = (status != ExportSuccess);
 
 	if (status != ExportSuccess)
 		return status;
-	if (previewFile.exists()) {
-		if (!formats.view(*this, previewFile, format))
-			return PreviewError;
-		else
-			return PreviewSuccess;
-	}
-	else {
-		// Successful export but no output file?
-		// Probably a bug in error detection.
-		LATTEST (status != ExportSuccess);
 
-		return status;
-	}
+	if (previewFile.exists())
+		return formats.view(*this, previewFile, format) ?
+			PreviewSuccess : PreviewError;
+
+	// Successful export but no output file?
+	// Probably a bug in error detection.
+	LATTEST(status != ExportSuccess);
+	return status;
 }