Merge remote-tracking branch 'origin/master' into GLrenderer

2015-09-16 16:17:39 +02:00
parent 12273f66af 12dc837f51
commit a5ffce8db8
6 changed files with 124 additions and 9 deletions
@@ -40,6 +40,7 @@ void dd::EventBroker::Unsubscribe(BaseEventRelay &relay) // ?
 	{
 		if (it->second == &relay)
 		{
+			relay.m_Broker = nullptr;
 			eventRelays.erase(it);
 			break;
 		}