Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-03-14 13:12:24 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-03-14 13:24:44 (GMT) |
| commit | f90fce80371ac12d97c6adc65a9437e4a3a7b268 (patch) | |
| tree | 9e277bc46ae0a0cf3e54aa252d1a5c630e35ec83 /Swift | |
| parent | 1089374439fa6073800679817198e3c39283113e (diff) | |
| download | swift-f90fce80371ac12d97c6adc65a9437e4a3a7b268.zip swift-f90fce80371ac12d97c6adc65a9437e4a3a7b268.tar.bz2 | |
Dispose of notification callbacks once the account signs out.
Fixes segfaults caused by clicking notifications after
the handlers had been freed.
Does not fix GrowlNotifier, which needs fixing later.
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/Controllers/EventNotifier.cpp | 1 | ||||
| -rw-r--r-- | Swift/QtUI/WindowsNotifier.cpp | 4 | ||||
| -rw-r--r-- | Swift/QtUI/WindowsNotifier.h | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/Swift/Controllers/EventNotifier.cpp b/Swift/Controllers/EventNotifier.cpp index 7ecc27c..e643ab3 100644 --- a/Swift/Controllers/EventNotifier.cpp +++ b/Swift/Controllers/EventNotifier.cpp @@ -27,6 +27,7 @@ EventNotifier::EventNotifier(EventController* eventController, Notifier* notifie } EventNotifier::~EventNotifier() { + notifier->purgeCallbacks(); eventController->onEventQueueEventAdded.disconnect(boost::bind(&EventNotifier::handleEventAdded, this, _1)); } diff --git a/Swift/QtUI/WindowsNotifier.cpp b/Swift/QtUI/WindowsNotifier.cpp index 1789451..212f0ca 100644 --- a/Swift/QtUI/WindowsNotifier.cpp +++ b/Swift/QtUI/WindowsNotifier.cpp @@ -47,4 +47,8 @@ void WindowsNotifier::handleMessageClicked() { } } +void WindowsNotifier::purgeCallbacks() { + lastCallback = boost::function<void()>(); +} + } diff --git a/Swift/QtUI/WindowsNotifier.h b/Swift/QtUI/WindowsNotifier.h index 062b76f..b2b5577 100644 --- a/Swift/QtUI/WindowsNotifier.h +++ b/Swift/QtUI/WindowsNotifier.h @@ -23,7 +23,8 @@ namespace Swift { ~WindowsNotifier(); virtual void showMessage(Type type, const std::string& subject, const std::string& description, const boost::filesystem::path& picture, boost::function<void()> callback); - + virtual void purgeCallbacks(); + private slots: void handleMessageClicked(); |