From c423bc90054e13eea2fc16bae9b6d30afdd361be Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 14 Apr 2016 02:20:48 +0100 Subject: Fix crash on emitting a signal during a constructor. --- src/lib/content.cc | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'src/lib') 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) 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 -- cgit v1.2.3