From b1d6c4a6f8aaedcb69ed111dff87cba87ccc96cc Mon Sep 17 00:00:00 2001
From: Tobias Markmann <tm@ayena.de>
Date: Mon, 9 Sep 2013 18:18:12 +0200
Subject: Fix heap-use-after-free bug reported by asan.

Change-Id: I891333b992d08b83cd4127bfd0893399735b5432
License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.

diff --git a/Swift/QtUI/QtSwift.cpp b/Swift/QtUI/QtSwift.cpp
index 4d4cef9..e84f9cf 100644
--- a/Swift/QtUI/QtSwift.cpp
+++ b/Swift/QtUI/QtSwift.cpp
@@ -247,13 +247,13 @@ QtSwift::~QtSwift() {
 		delete controller;
 	}
 	delete notifier_;
-	delete settingsHierachy_;
-	delete qtSettings_;
-	delete xmlSettings_;
 	foreach (QtSystemTray* tray, systemTrays_) {
 		delete tray;
 	}
 	delete tabs_;
+	delete settingsHierachy_;
+	delete qtSettings_;
+	delete xmlSettings_;
 	delete splitter_;
 	delete statusCache_;
 	delete uriHandler_;
-- 
cgit v0.10.2-6-g49f6