Merge 1.19 to main (#716)

fix: badger.subscribeToSettings Failing With power_save_status & ShareWatchHistoryStatus Keys (#712) * fix: badger.subscribeToSettings Failing With power_save_status & ShareWatchHistoryStatus Keys
rdkcentral · Jan 23, 2025 · bcde45f · bcde45f
1 parent 71d659a
commit bcde45f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/.github/workflows/Build.yml b/.github/workflows/Build.yml
@@ -4,7 +4,7 @@ on:
   push:
     branches: [ "main" ]
   pull_request:
-    branches: [ "main", "1.16.rc" ]
+    branches: [ "main", "1.19.rc" ]
 
 env:
   CARGO_TERM_COLOR: always

diff --git a/core/main/src/processor/settings_processor.rs b/core/main/src/processor/settings_processor.rs
@@ -276,7 +276,7 @@ impl SettingsProcessor {
                     }
                 }
                 SettingKey::ShareWatchHistory => {
-                    if Self::subscribe_event(
+                    if !Self::subscribe_event(
                         state,
                         ctx.clone(),
                         EVENT_SHARE_WATCH_HISTORY,
@@ -303,7 +303,6 @@ impl SettingsProcessor {
                 }
                 SettingKey::PowerSaving | SettingKey::LegacyMiniGuide => {
                     warn!("{} Not implemented", key.to_string());
-                    resp = false
                 }
             }
         }