From 052e4bc508868bbc56f03f7fac8f16fbe58e3b76 Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Thu, 1 Aug 2019 10:17:19 +0100
Subject: [PATCH] Fix complex box closing.

~BoxContent should be called when _layers is already in valid state.
---
 Telegram/SourceFiles/window/layer_widget.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Telegram/SourceFiles/window/layer_widget.cpp b/Telegram/SourceFiles/window/layer_widget.cpp
index 1c1bb24ee..204368c32 100644
--- a/Telegram/SourceFiles/window/layer_widget.cpp
+++ b/Telegram/SourceFiles/window/layer_widget.cpp
@@ -480,7 +480,7 @@ void LayerStackWidget::closeLayer(not_null<LayerWidget*> layer) {
 		if (_layers.size() == 1) {
 			hideCurrent(anim::type::normal);
 		} else {
-			auto taken = std::move(_layers.back());
+			const auto taken = std::move(_layers.back());
 			_layers.pop_back();
 
 			layer = currentLayer();
@@ -493,6 +493,7 @@ void LayerStackWidget::closeLayer(not_null<LayerWidget*> layer) {
 	} else {
 		for (auto i = _layers.begin(), e = _layers.end(); i != e; ++i) {
 			if (layer == i->get()) {
+				const auto taken = std::move(*i);
 				_layers.erase(i);
 				break;
 			}