From 60cb7a16831dea5226e8733d1599d1231b5a6860 Mon Sep 17 00:00:00 2001
From: Richard Heck <rgheck@lyx.org>
Date: Fri, 29 Dec 2017 15:53:43 -0500
Subject: [PATCH] Minor code simplification.

---
 src/Text3.cpp | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/src/Text3.cpp b/src/Text3.cpp
index e8a401c551..812f280a29 100644
--- a/src/Text3.cpp
+++ b/src/Text3.cpp
@@ -1476,17 +1476,15 @@ void Text::dispatch(Cursor & cur, FuncRequest & cmd)
 
 		if (change_layout) {
 			setLayout(cur, layout);
-			bool do_nest = false;
-			set<docstring> autonests;
-			set<docstring> autonested;
-			if (cur.pit() > 0) {
-				autonests = pars_[cur.pit() - 1].layout().autonests();
-				autonested = pars_[cur.pit()].layout().isAutonestedBy();
-				do_nest = !ignoreautonests;
+			if (cur.pit() > 0 && !ignoreautonests) {
+				set<docstring> const & autonests =
+						pars_[cur.pit() - 1].layout().autonests();
+				set<docstring> const & autonested =
+						pars_[cur.pit()].layout().isAutonestedBy();
+				if (autonests.find(layout) != autonests.end()
+						|| autonested.find(old_layout) != autonested.end())
+					lyx::dispatch(FuncRequest(LFUN_DEPTH_INCREMENT));
 			}
-			if (do_nest && (autonests.find(layout) != autonests.end()
-					|| autonested.find(old_layout) != autonested.end()))
-				lyx::dispatch(FuncRequest(LFUN_DEPTH_INCREMENT));
 		}
 
 		Layout::LaTeXArgMap args = tclass[layout].args();
-- 
2.39.2