diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java
index 0ce66780a..9db256e22 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/activity/SettingPlayerActivity.java
@@ -101,10 +101,12 @@ public class SettingPlayerActivity extends BaseActivity implements UaCallback, B
     @Override
     public void setBuffer(int minute) {
         mBinding.bufferText.setText(String.valueOf(minute));
+        Setting.putBuffer(minute);
     }
 
     @Override
     public void setSubtitle(int size) {
         mBinding.subtitleText.setText(String.valueOf(size));
+        Setting.putSubtitle(size);
     }
 }
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/BufferDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/BufferDialog.java
index 93367f493..dd49d98c3 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/BufferDialog.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/BufferDialog.java
@@ -43,10 +43,7 @@ public class BufferDialog {
     }
 
     private void initEvent() {
-        binding.slider.addOnChangeListener((slider, value, fromUser) -> {
-            callback.setBuffer((int) value);
-            Setting.putBuffer((int) value);
-        });
+        binding.slider.addOnChangeListener((slider, value, fromUser) -> callback.setBuffer((int) value));
         binding.slider.setOnKeyListener((view, keyCode, event) -> {
             boolean enter = Utils.isEnterKey(event);
             if (enter) dialog.dismiss();
diff --git a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/SubtitleDialog.java b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/SubtitleDialog.java
index 6574bc6f0..f261c1468 100644
--- a/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/SubtitleDialog.java
+++ b/app/src/leanback/java/com/fongmi/android/tv/ui/custom/dialog/SubtitleDialog.java
@@ -64,7 +64,6 @@ public class SubtitleDialog {
 
     private void onPositive(View view) {
         callback.setSubtitle((int) binding.slider.getValue());
-        Setting.putSubtitle((int) binding.slider.getValue());
         dialog.dismiss();
     }
 
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/BufferDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/BufferDialog.java
index c9865f793..225fa5335 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/BufferDialog.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/BufferDialog.java
@@ -44,7 +44,6 @@ public class BufferDialog {
 
     private void onPositive(DialogInterface dialog, int which) {
         callback.setBuffer((int) binding.slider.getValue());
-        Setting.putBuffer((int) binding.slider.getValue());
         dialog.dismiss();
     }
 
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/SubtitleDialog.java b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/SubtitleDialog.java
index 8367fcccc..ec70eda15 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/SubtitleDialog.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/custom/dialog/SubtitleDialog.java
@@ -65,7 +65,6 @@ public class SubtitleDialog {
 
     private void onPositive(DialogInterface dialog, int which) {
         callback.setSubtitle((int) binding.slider.getValue());
-        Setting.putSubtitle((int) binding.slider.getValue());
         dialog.dismiss();
     }
 
diff --git a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java
index 4fe6d128d..e60755d20 100644
--- a/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java
+++ b/app/src/mobile/java/com/fongmi/android/tv/ui/fragment/SettingPlayerFragment.java
@@ -119,11 +119,13 @@ public class SettingPlayerFragment extends BaseFragment implements UaCallback, B
     @Override
     public void setBuffer(int minute) {
         mBinding.bufferText.setText(String.valueOf(minute));
+        Setting.putBuffer(minute);
     }
 
     @Override
     public void setSubtitle(int size) {
         mBinding.subtitleText.setText(String.valueOf(size));
+        Setting.putSubtitle(size);
     }
 
     @Override