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

Allow user to quit Android app with back button.
dolphin-emu · Jun 23, 2014 · ffacb26 · ffacb26
2 parents 01fc1a6 + 2c1008f
commit ffacb26
Showing 1 changed file with 8 additions and 1 deletion.
diff --git 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 void onRestoreInstanceState(Bundle savedInstanceState)
 	@Override
 	public void onBackPressed()
 	{
-		SwitchPage(0);
+		if (mCurFragmentNum == 0)
+		{
+			finish();
+		}
+		else
+		{
+			SwitchPage(0);
+		}
 	}
 }