Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-03-31 14:45:56 +02:00
commit 6f9c679f1a

View file

@ -382,7 +382,7 @@ public class AppInitializer implements IProgress {
app.favorites.loadFavorites(); app.favorites.loadFavorites();
notifyEvent(InitEvents.FAVORITES_INITIALIZED); notifyEvent(InitEvents.FAVORITES_INITIALIZED);
// init poi types before indexes and before POI // init poi types before indexes and before POI
initPoiTypes(); //initPoiTypes();
app.resourceManager.reloadIndexesOnStart(this, warnings); app.resourceManager.reloadIndexesOnStart(this, warnings);
@ -391,7 +391,8 @@ public class AppInitializer implements IProgress {
// native depends on renderers // native depends on renderers
initNativeCore(); initNativeCore();
notifyEvent(InitEvents.NATIVE_INITIALIZED); notifyEvent(InitEvents.NATIVE_INITIALIZED);
//temporary experiment
initPoiTypes();
app.poiFilters.reloadAllPoiFilters(); app.poiFilters.reloadAllPoiFilters();
notifyEvent(InitEvents.POI_TYPES_INITIALIZED); notifyEvent(InitEvents.POI_TYPES_INITIALIZED);