Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-03-16 10:05:19 +01:00
commit 31a373e091

View file

@ -1043,7 +1043,7 @@ public class OsMoGroupsActivity extends OsmandExpandableListActivity implements
@Override @Override
public void run() { public void run() {
String top = OsMoGroupsActivity.this.operation; String top = OsMoGroupsActivity.this.operation;
if (top.equals(operation) || (operation != null && operation.equals(top))) { if (operation != null && operation.equals(top)) {
hideProgressBar(); hideProgressBar();
} }
if (joinGroup && (operation != null && operation.startsWith("GROUP_CONNECT"))) { if (joinGroup && (operation != null && operation.startsWith("GROUP_CONNECT"))) {