Merge pull request #529 from sigmabeta/quit-app-with-back

Allow user to quit Android app with back button.
2014-06-23 10:43:14 -04:00 · 2014-06-23 10:43:14 -04:00 · ffacb26ff8
parent 01fc1a6c54 2c1008f0ae
commit ffacb26ff8
1 changed files with 8 additions and 1 deletions
--- a/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
+++ b/Source/Android/src/org/dolphinemu/dolphinemu/gamelist/GameListActivity.java
@ -298,6 +298,13 @@ public final class GameListActivity extends Activity
 	@Override
 	public void onBackPressed()
 	{
-		SwitchPage(0);
+		if (mCurFragmentNum == 0)
+		{
+			finish();
+		}
+		else
+		{
+			SwitchPage(0);
+		}
 	}
 }