From: Bo Peng <bpeng@lyx.org>
Date: Sun, 6 Jan 2008 16:21:57 +0000 (+0000)
Subject: Embedding: save checksum of the bundled file, not content.lyx (to avoid file external... 
X-Git-Tag: 1.6.10~6743
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=2a69b32fa48517c20334171b95522ebcc0c17364;p=lyx.git

Embedding: save checksum of the bundled file, not content.lyx (to avoid file externally modified warnings).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@22394 a592a061-630c-0410-9148-cb99ea01b6c8
---

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 44572501ea..2779f7700f 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -672,6 +672,8 @@ bool Buffer::readFile(FileName const & filename)
 		FileName lyxfile(addName(temppath(), "content.lyx"));
 		// if both manifest.txt and file.lyx exist, this is am embedded file
 		if (lyxfile.exists()) {
+			// if in bundled format, save checksum of the compressed file, not content.lyx
+			saveCheckSum(filename);
 			params().embedded = true;
 			fname = lyxfile;
 		}
@@ -908,20 +910,19 @@ bool Buffer::writeFile(FileName const & fname) const
 	}
 
 	removeAutosaveFile(d->filename.absFilename());
+
+	if (params().embedded) {
+		message(str + _(" writing embedded files!."));
+		// if embedding is enabled, write file.lyx and all the embedded files
+		// to the zip file fname.
+		if (!d->embedded_files.writeFile(fname)) {
+			message(str + _(" could not write embedded files!."));
+			return false;
+		}
+	}
 	saveCheckSum(d->filename);
 	message(str + _(" done."));
 
-	if (!params().embedded)
-		return true;
-
-	message(str + _(" writing embedded files!."));
-	// if embedding is enabled, write file.lyx and all the embedded files
-	// to the zip file fname.
-	if (!d->embedded_files.writeFile(fname)) {
-		message(str + _(" could not write embedded files!."));
-		return false;
-	}
-	message(str + _(" error while writing embedded files."));
 	return true;
 }