From 396365c709d7f18a1ed44b9d9bea0f4cdeda6bf0 Mon Sep 17 00:00:00 2001
From: Will Morrow <duh102@gmail.com>
Date: Mon, 12 Jan 2026 17:56:47 -0500
Subject: [PATCH] Revert changes

---
 src/CrossPointSettings.cpp                  | 5 +----
 src/CrossPointSettings.h                    | 2 --
 src/activities/boot_sleep/SleepActivity.cpp | 8 +-------
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/src/CrossPointSettings.cpp b/src/CrossPointSettings.cpp
index 4898fdde..cd8b56f7 100644
--- a/src/CrossPointSettings.cpp
+++ b/src/CrossPointSettings.cpp
@@ -14,7 +14,7 @@ CrossPointSettings CrossPointSettings::instance;
 namespace {
 constexpr uint8_t SETTINGS_FILE_VERSION = 1;
 // Increment this when adding new persisted settings fields
-constexpr uint8_t SETTINGS_COUNT = 18;
+constexpr uint8_t SETTINGS_COUNT = 17;
 constexpr char SETTINGS_FILE[] = "/.crosspoint/settings.bin";
 }  // namespace
 
@@ -46,7 +46,6 @@ bool CrossPointSettings::saveToFile() const {
   serialization::writePod(outputFile, sleepScreenCoverMode);
   serialization::writeString(outputFile, std::string(opdsServerUrl));
   serialization::writePod(outputFile, textAntiAliasing);
-  serialization::writePod(outputFile, lastUsedSleep);
   outputFile.close();
 
   Serial.printf("[%lu] [CPS] Settings saved to file\n", millis());
@@ -111,8 +110,6 @@ bool CrossPointSettings::loadFromFile() {
     }
     serialization::readPod(inputFile, textAntiAliasing);
     if (++settingsRead >= fileSettingsCount) break;
-    serialization::readPod(inputFile, lastUsedSleep);
-    if (++settingsRead >= fileSettingsCount) break;
   } while (false);
 
   inputFile.close();
diff --git a/src/CrossPointSettings.h b/src/CrossPointSettings.h
index 3b72aa6b..3a2a3503 100644
--- a/src/CrossPointSettings.h
+++ b/src/CrossPointSettings.h
@@ -82,8 +82,6 @@ class CrossPointSettings {
   uint8_t screenMargin = 5;
   // OPDS browser settings
   char opdsServerUrl[128] = "";
-  // Last used sleep screen index (for custom screens)
-  uint8_t lastUsedSleep = 0;
 
   ~CrossPointSettings() = default;
 
diff --git a/src/activities/boot_sleep/SleepActivity.cpp b/src/activities/boot_sleep/SleepActivity.cpp
index 7df9fcb2..43e8e60b 100644
--- a/src/activities/boot_sleep/SleepActivity.cpp
+++ b/src/activities/boot_sleep/SleepActivity.cpp
@@ -81,13 +81,7 @@ void SleepActivity::renderCustomSleepScreen() const {
     if (numFiles > 0) {
       // Generate a random number between 1 and numFiles
       const auto randomFileIndex = random(numFiles);
-      // If we re-generated the same index as the last sleep screen,
-      //   use the next one (modulo the number of files we have)
-      const auto realFileIndex =
-          randomFileIndex == SETTINGS.lastUsedSleep ? randomFileIndex + 1 % numFiles : randomFileIndex;
-      SETTINGS.lastUsedSleep = realFileIndex;
-      SETTINGS.saveToFile();
-      const auto filename = "/sleep/" + files[realFileIndex];
+      const auto filename = "/sleep/" + files[randomFileIndex];
       FsFile file;
       if (SdMan.openFileForRead("SLP", filename, file)) {
         Serial.printf("[%lu] [SLP] Randomly loading: /sleep/%s\n", millis(), files[randomFileIndex].c_str());