Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-08-17 18:56:37 +02:00
commit b20043ab1e
2 changed files with 2 additions and 2 deletions

View file

@ -281,7 +281,7 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
FirstUsageWelcomeFragment.SHOW = false;
getSupportFragmentManager().beginTransaction()
.add(R.id.fragmentContainer, new FirstUsageWelcomeFragment(),
FirstUsageWelcomeFragment.TAG).commit();
FirstUsageWelcomeFragment.TAG).commitAllowingStateLoss();
}
mapActions.updateDrawerMenu();
drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);

View file

@ -727,7 +727,7 @@ public class FirstUsageWizardFragment extends Fragment implements OsmAndLocation
activity.getSupportFragmentManager()
.beginTransaction()
.replace(R.id.fragmentContainer, fragment, FirstUsageWizardFragment.TAG)
.commit();
.commitAllowingStateLoss();
}
}