summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Smith <git@kismith.co.uk>2011-10-17 15:40:06 (GMT)
committerKevin Smith <git@kismith.co.uk>2011-10-17 15:40:06 (GMT)
commit5b1063b0df14f16fb8d0f0e811fc014e67489ad6 (patch)
tree33d9e4b76d3eca635c5e2284db4af7459da5455d
parent76978866497a7dd9be96edef5fa06f470a6b324f (diff)
downloadswift-contrib-5b1063b0df14f16fb8d0f0e811fc014e67489ad6.zip
swift-contrib-5b1063b0df14f16fb8d0f0e811fc014e67489ad6.tar.bz2
Don't crash in ad-hoc after signout/signin.
Resolves: #1014
-rw-r--r--Swift/Controllers/MainController.cpp2
1 files changed, 2 insertions, 0 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp
index 364dd57..71740d4 100644
--- a/Swift/Controllers/MainController.cpp
+++ b/Swift/Controllers/MainController.cpp
@@ -232,18 +232,20 @@ void MainController::resetClient() {
storages_ = NULL;
delete statusTracker_;
statusTracker_ = NULL;
delete profileSettings_;
profileSettings_ = NULL;
delete userSearchControllerChat_;
userSearchControllerChat_ = NULL;
delete userSearchControllerAdd_;
userSearchControllerAdd_ = NULL;
+ delete adHocManager_;
+ adHocManager_ = NULL;
clientInitialized_ = false;
}
void MainController::handleUIEvent(boost::shared_ptr<UIEvent> event) {
boost::shared_ptr<ToggleNotificationsUIEvent> notificationsEvent = boost::dynamic_pointer_cast<ToggleNotificationsUIEvent>(event);
if (notificationsEvent) {
bool enabled = notificationsEvent->getEnabled();
notifier_->setPersistentEnabled(enabled);
settings_->storeBool(SHOW_NOTIFICATIONS, enabled);