summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCătălin Badea <catalin.badea392@gmail.com>2012-09-24 20:05:56 (GMT)
committerKevin Smith <git@kismith.co.uk>2012-09-27 06:50:57 (GMT)
commit9fe15d5e2d57282f987dfe584395c16a6b9cd6f9 (patch)
treef9a1054484a94b109d8f3fa385bb6f9bf36a39e6
parent21719e2ca06b12d214c32ed24b3ecc2227c8dd07 (diff)
downloadswift-9fe15d5e2d57282f987dfe584395c16a6b9cd6f9.zip
swift-9fe15d5e2d57282f987dfe584395c16a6b9cd6f9.tar.bz2
Fix a crash that occurs when resetting the client
Fix history view controller from crashing when resetting the client. License: This patch is BSD-licensed, see Documentation/Licenses/BSD-simplified.txt for details.
-rw-r--r--Swift/Controllers/MainController.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index 581ff31..1b0b595 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -230,10 +230,10 @@ void MainController::resetClient() {
delete chatsManager_;
chatsManager_ = NULL;
#ifdef SWIFT_EXPERIMENTAL_HISTORY
- delete historyController_;
- historyController_ = NULL;
delete historyViewController_;
historyViewController_ = NULL;
+ delete historyController_;
+ historyController_ = NULL;
#endif
delete ftOverview_;
ftOverview_ = NULL;