From cc296918752b942205719fdc11585f05ecff223b Mon Sep 17 00:00:00 2001
From: Sean Maas <seanmaas27@gmail.com>
Date: Tue, 10 Jan 2017 17:12:42 -0500
Subject: [PATCH] Android: Change Exit Without Saving to Save and Exit

---
 .../dolphinemu/ui/settings/SettingsActivityPresenter.java   | 3 +--
 Source/Android/app/src/main/res/menu/menu_settings.xml      | 6 +++---
 Source/Android/app/src/main/res/values/strings.xml          | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityPresenter.java b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityPresenter.java
index 4e377b565a..f78e37098b 100644
--- a/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityPresenter.java
+++ b/Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/ui/settings/SettingsActivityPresenter.java
@@ -91,8 +91,7 @@ public final class SettingsActivityPresenter
 	{
 		switch (itemId)
 		{
-			case R.id.menu_exit_no_save:
-				mShouldSave = false;
+			case R.id.menu_save_exit:
 				mView.finish();
 				return true;
 		}
diff --git a/Source/Android/app/src/main/res/menu/menu_settings.xml b/Source/Android/app/src/main/res/menu/menu_settings.xml
index af1aeb8abe..b2f735c442 100644
--- a/Source/Android/app/src/main/res/menu/menu_settings.xml
+++ b/Source/Android/app/src/main/res/menu/menu_settings.xml
@@ -3,9 +3,9 @@
       xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <item
-        android:id="@+id/menu_exit_no_save"
-        android:title="@string/preferences_exit_no_save"
-        android:icon="@drawable/ic_cancel"
+        android:id="@+id/menu_save_exit"
+        android:title="@string/preferences_save_exit"
+        android:icon="@drawable/ic_quicksave"
         app:showAsAction="ifRoom"/>
 
 </menu>
\ No newline at end of file
diff --git a/Source/Android/app/src/main/res/values/strings.xml b/Source/Android/app/src/main/res/values/strings.xml
index b594fe4801..d92e2a9398 100644
--- a/Source/Android/app/src/main/res/values/strings.xml
+++ b/Source/Android/app/src/main/res/values/strings.xml
@@ -199,7 +199,7 @@
     <string name="add_directory_empty_folder">That folder is empty.</string>
 
     <!-- Preferences Screen -->
-    <string name="preferences_exit_no_save">Exit Without Saving</string>
+    <string name="preferences_save_exit">Save and Exit</string>
     <string name="preferences_settings">Settings</string>
     <string name="preferences_extensions">Extension Bindings</string>