From fc40b745ad3ed6f04ab1cb71021b75e66bb3ffa7 Mon Sep 17 00:00:00 2001
From: Yuriy Liskov <firsthash@gmail.com>
Date: Sun, 25 May 2025 09:31:07 +0300
Subject: [PATCH] data store delay fix

---
 .../liskovsoft/smartyoutubetv2/common/prefs/GeneralData.java    | 1 +
 .../com/liskovsoft/smartyoutubetv2/common/prefs/PlayerData.java | 2 ++
 .../smartyoutubetv2/common/prefs/PlayerTweaksData.java          | 1 +
 3 files changed, 4 insertions(+)

diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/GeneralData.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/GeneralData.java
index df48f0584..86ea51650 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/GeneralData.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/GeneralData.java
@@ -787,6 +787,7 @@ public class GeneralData implements ProfileChangeListener {
 
     @Override
     public void onProfileChanged() {
+        Utils.removeCallbacks(mPersistStateInt);
         restoreState();
     }
 }
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/PlayerData.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/PlayerData.java
index b7fa5c7f0..2e35d4c39 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/PlayerData.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/PlayerData.java
@@ -880,6 +880,8 @@ public class PlayerData extends DataChangeBase implements PlayerConstants, Profi
 
     @Override
     public void onProfileChanged() {
+        Utils.removeCallbacks(mPersistStateInt);
+
         // reset on profile change
         mSpeeds.clear();
 
diff --git a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/PlayerTweaksData.java b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/PlayerTweaksData.java
index cab26df0d..c3949cbef 100644
--- a/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/PlayerTweaksData.java
+++ b/common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/PlayerTweaksData.java
@@ -709,6 +709,7 @@ public class PlayerTweaksData implements ProfileChangeListener {
 
     @Override
     public void onProfileChanged() {
+        Utils.removeCallbacks(mPersistDataInt);
         restoreData();
     }
 }