diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-04-14 02:20:48 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-05-18 11:50:29 +0100 |
| commit | c423bc90054e13eea2fc16bae9b6d30afdd361be (patch) | |
| tree | 5dcbe36aacdeb26f7fae2a0d009ccb04ec101f60 /src/lib/content.cc | |
| parent | 2d5beb0d6794df13ad1df47e84fd7a57d1d1c64d (diff) | |
Fix crash on emitting a signal during a constructor.
Diffstat (limited to 'src/lib/content.cc')
| -rw-r--r-- | src/lib/content.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/content.cc b/src/lib/content.cc index 499f90dd1..3b9c3e3a1 100644 --- a/src/lib/content.cc +++ b/src/lib/content.cc @@ -155,8 +155,12 @@ Content::examine (shared_ptr<Job> job) void Content::signal_changed (int p) { - changed (p); - emit (boost::bind (boost::ref (Changed), shared_from_this (), p, _change_signals_frequent)); + try { + emit (boost::bind (boost::ref (Changed), shared_from_this (), p, _change_signals_frequent)); + changed (p); + } catch (boost::bad_weak_ptr) { + /* This must be during construction; never mind */ + } } void |