From 29c6b8e2d2dd55794f94225f2442a931fe45073a Mon Sep 17 00:00:00 2001
From: John Preston <johnprestonmail@gmail.com>
Date: Fri, 25 Mar 2016 23:46:35 +0300
Subject: [PATCH] Dependent items clearing done better Fixed crash on launch if
 audio playback could not be started

---
 Telegram/SourceFiles/app.cpp     | 12 ++++++++----
 Telegram/SourceFiles/audio.cpp   |  7 +++++--
 Telegram/SourceFiles/history.cpp |  6 +-----
 3 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/Telegram/SourceFiles/app.cpp b/Telegram/SourceFiles/app.cpp
index b35fc9abc..bfb2e8268 100644
--- a/Telegram/SourceFiles/app.cpp
+++ b/Telegram/SourceFiles/app.cpp
@@ -67,7 +67,8 @@ namespace {
 	SharedContactItems sharedContactItems;
 	GifItems gifItems;
 
-	typedef QMap<HistoryItem*, OrderedSet<HistoryItem*> > DependentItems;
+	typedef OrderedSet<HistoryItem*> DependentItemsSet;
+	typedef QMap<HistoryItem*, DependentItemsSet> DependentItems;
 	DependentItems dependentItems;
 
 	Histories histories;
@@ -1803,10 +1804,13 @@ namespace App {
 		historyItemDetached(item);
 		auto j = ::dependentItems.find(item);
 		if (j != ::dependentItems.cend()) {
-			for_const (HistoryItem *dependent, j.value()) {
+			DependentItemsSet items;
+			std::swap(items, j.value());
+			::dependentItems.erase(j);
+
+			for_const (HistoryItem *dependent, items) {
 				dependent->dependencyItemRemoved(item);
 			}
-			::dependentItems.erase(j);
 		}
 		if (App::main() && !App::quitting()) {
 			App::main()->itemRemoved(item);
@@ -1903,7 +1907,7 @@ namespace App {
 	}
 
 	void historyUnregDependency(HistoryItem *dependent, HistoryItem *dependency) {
-		DependentItems::iterator i = ::dependentItems.find(dependency);
+		auto i = ::dependentItems.find(dependency);
 		if (i != ::dependentItems.cend()) {
 			i.value().remove(dependent);
 			if (i.value().isEmpty()) {
diff --git a/Telegram/SourceFiles/audio.cpp b/Telegram/SourceFiles/audio.cpp
index 139c617d6..29205c7af 100644
--- a/Telegram/SourceFiles/audio.cpp
+++ b/Telegram/SourceFiles/audio.cpp
@@ -227,12 +227,15 @@ void audioPlayNotify() {
 	emit audioPlayer()->faderOnTimer();
 }
 
+// can be called at any moment when audio error
 void audioFinish() {
 	if (player) {
-		deleteAndMark(player);
+		delete player;
+		player = nullptr;
 	}
 	if (capture) {
-		deleteAndMark(capture);
+		delete capture;
+		capture = nullptr;
 	}
 
 	alSourceStop(notifySource);
diff --git a/Telegram/SourceFiles/history.cpp b/Telegram/SourceFiles/history.cpp
index 2b1b3173b..ff82dc777 100644
--- a/Telegram/SourceFiles/history.cpp
+++ b/Telegram/SourceFiles/history.cpp
@@ -6096,11 +6096,7 @@ void HistoryMessageReply::resize(int width) const {
 
 void HistoryMessageReply::itemRemoved(HistoryMessage *holder, HistoryItem *removed) {
 	if (replyToMsg == removed) {
-		delete _replyToVia;
-		_replyToVia = nullptr;
-
-		replyToMsg = nullptr;
-		replyToMsgId = 0;
+		clearData(holder);
 		holder->setPendingInitDimensions();
 	}
 }