Commit a99d529a authored by Eike Ziller's avatar Eike Ziller

Merge remote-tracking branch 'origin/4.0' into 4.1

Change-Id: Ice4824c6148c8b960f9a61c6685387727627b38d
parents 1ccec988 ccc46bbe
......@@ -195,7 +195,7 @@ public:
void operator=(Runnable other) { d = std::move(other.d); }
template <class T> bool is() const {
return d.get()->typeId() == T::staticTypeId;
return d.get() && (d.get()->typeId() == T::staticTypeId);
}
template <class T> const T &as() const {
......@@ -235,7 +235,7 @@ public:
void operator=(Connection other) { d = std::move(other.d); }
template <class T> bool is() const {
return d.get()->typeId() == T::staticTypeId;
return d.get() && (d.get()->typeId() == T::staticTypeId);
}
template <class T> const T &as() const {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment