Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2017-03-29 09:08:44 +02:00
commit 425b5fb1bc

View file

@ -573,6 +573,8 @@ public class MapActivity extends OsmandActionBarActivity implements DownloadEven
ExternalApiHelper apiHelper = new ExternalApiHelper(this); ExternalApiHelper apiHelper = new ExternalApiHelper(this);
Intent result = apiHelper.processApiRequest(intent); Intent result = apiHelper.processApiRequest(intent);
setResult(apiHelper.getResultCode(), result); setResult(apiHelper.getResultCode(), result);
result.setAction(null);
setIntent(result);
if (apiHelper.needFinish()) { if (apiHelper.needFinish()) {
finish(); finish();
} }