From: Richard Heck <rgheck@comcast.net>
Date: Mon, 25 Oct 2010 15:33:51 +0000 (+0000)
Subject: Little bit of cleanup, motivated by need to squash a warning.
X-Git-Tag: 2.0.0~2251
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=3e5370757012e9a3e468b8a77c0e288383246379;p=features.git

Little bit of cleanup, motivated by need to squash a warning.

The only substantive change here is moving the markDirty() call into the
first case. If we don't load the file successfully, then there is no
need to mark dirty.


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

diff --git a/src/Buffer.cpp b/src/Buffer.cpp
index 5b7cc8219a..6db387a35f 100644
--- a/src/Buffer.cpp
+++ b/src/Buffer.cpp
@@ -3625,40 +3625,45 @@ Buffer::ReadStatus Buffer::readEmergency(FileName const & fn)
 	docstring const file = makeDisplayPath(fn.absFileName(), 20);
 	docstring const text = bformat(_("An emergency save of the document "
 		"%1$s exists.\n\nRecover emergency save?"), file);
-	int const ret = Alert::prompt(_("Load emergency save?"), text,
+	
+	int const load_emerg = Alert::prompt(_("Load emergency save?"), text,
 		0, 2, _("&Recover"), _("&Load Original"), _("&Cancel"));
 
-	switch (ret)
+	switch (load_emerg)
 	{
 	case 0: {
-		// the file is not saved if we load the emergency file.
-		markDirty();
 		docstring str;
-		bool res;
 		ReadStatus const ret_rf = readFile(emergencyFile);
-		if (res = (ret_rf == ReadSuccess)) {
+		bool const success = (ret_rf == ReadSuccess);
+		if (success) {
 			saveCheckSum(fn);
+			markDirty();
 			str = _("Document was successfully recovered.");
 		} else
 			str = _("Document was NOT successfully recovered.");
 		str += "\n\n" + bformat(_("Remove emergency file now?\n(%1$s)"),
 					makeDisplayPath(emergencyFile.absFileName()));
 
-		if (!Alert::prompt(_("Delete emergency file?"), str, 1, 1,
-				_("&Remove"), _("&Keep"))) {
+		int const del_emerg = 
+			Alert::prompt(_("Delete emergency file?"), str, 1, 1,
+				_("&Remove"), _("&Keep"));
+		if (del_emerg == 0) {
 			emergencyFile.removeFile();
-			if (res)
+			if (success)
 				Alert::warning(_("Emergency file deleted"),
 					_("Do not forget to save your file now!"), true);
 			}
-		return res ? ReadSuccess : ReadEmergencyFailure;
+		return success ? ReadSuccess : ReadEmergencyFailure;
 	}
-	case 1:
-		if (!Alert::prompt(_("Delete emergency file?"),
+	case 1: {
+		int const del_emerg =
+			Alert::prompt(_("Delete emergency file?"),
 				_("Remove emergency file now?"), 1, 1,
-				_("&Remove"), _("&Keep")))
+				_("&Remove"), _("&Keep"));
+		if (del_emerg == 0)
 			emergencyFile.removeFile();
 		return ReadOriginal;
+	}
 
 	default:
 		break;