diff --git a/application/res/menu/servers.xml b/application/res/menu/servers.xml index d1a13ab..62df38d 100644 --- a/application/res/menu/servers.xml +++ b/application/res/menu/servers.xml @@ -35,7 +35,7 @@ along with Yaaic. If not, see . android:title="@string/about_menu" android:icon="@android:drawable/ic_menu_help" /> \ No newline at end of file diff --git a/application/res/values/strings.xml b/application/res/values/strings.xml index 1d4dc29..bd63570 100644 --- a/application/res/values/strings.xml +++ b/application/res/values/strings.xml @@ -5,7 +5,7 @@ Settings About - Exit + Disconnect all About Settings diff --git a/application/src/org/yaaic/activity/ServersActivity.java b/application/src/org/yaaic/activity/ServersActivity.java index 306063e..ed7d4a0 100644 --- a/application/src/org/yaaic/activity/ServersActivity.java +++ b/application/src/org/yaaic/activity/ServersActivity.java @@ -289,7 +289,7 @@ public class ServersActivity extends SherlockActivity implements ServiceConnecti case R.id.settings: startActivity(new Intent(this, SettingsActivity.class)); break; - case R.id.exit: + case R.id.disconnect_all: ArrayList mServers = Yaaic.getInstance().getServersAsArrayList(); for (Server server : mServers) { if (binder.getService().hasConnection(server.getId())) { @@ -300,7 +300,6 @@ public class ServersActivity extends SherlockActivity implements ServiceConnecti } // ugly binder.getService().stopForegroundCompat(R.string.app_name); - finish(); } return true;