Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-06-11 13:48:24 +02:00
commit aedd385e91

View file

@ -73,15 +73,18 @@ public class DashOsMoFragment extends DashLocationFragment implements OsMoGroups
plugin = OsmandPlugin.getEnabledPlugin(OsMoPlugin.class); plugin = OsmandPlugin.getEnabledPlugin(OsMoPlugin.class);
if (plugin != null) { if (plugin != null) {
plugin.getGroups().addUiListeners(this); plugin.getGroups().addUiListeners(this);
plugin.setGroupsActivity(getActivity());
} }
setupOsMoView(); setupOsMoView();
plugin.setGroupsActivity(getActivity());
} }
@Override @Override
public void onDetach() { public void onDetach() {
super.onDetach(); super.onDetach();
plugin.setGroupsActivity(null); if (plugin != null) {
plugin.setGroupsActivity(null);
}
} }
@Override @Override