Merge pull request #2120 from luacs1998/eventbus_fix

Fix a possible crash in EventBus
This commit is contained in:
LexManos 2015-09-27 02:12:50 -07:00
commit 90829a3164

View file

@ -121,6 +121,8 @@ public class EventBus implements IEventExceptionHandler
public void unregister(Object object) public void unregister(Object object)
{ {
ArrayList<IEventListener> list = listeners.remove(object); ArrayList<IEventListener> list = listeners.remove(object);
if(list == null)
return;
for (IEventListener listener : list) for (IEventListener listener : list)
{ {
ListenerList.unregisterAll(busID, listener); ListenerList.unregisterAll(busID, listener);