From e489b08bc1d1682e62d65054c9a724c0ea75ac87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bla=C5=BE=20Kristan?= Date: Thu, 9 Dec 2021 13:01:22 +0100 Subject: [PATCH] Possible double JSON use bugfix. --- wled00/playlist.cpp | 2 +- wled00/wled.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/wled00/playlist.cpp b/wled00/playlist.cpp index 47725417f..1e9d472d1 100644 --- a/wled00/playlist.cpp +++ b/wled00/playlist.cpp @@ -119,7 +119,7 @@ int16_t loadPlaylist(JsonObject playlistObj, byte presetId) { void handlePlaylist() { static unsigned long presetCycledTime = 0; - if (currentPlaylist < 0 || playlistEntries == nullptr) return; + if (currentPlaylist < 0 || playlistEntries == nullptr || fileDoc != nullptr) return; if (millis() - presetCycledTime > (100*playlistEntryDur)) { presetCycledTime = millis(); diff --git a/wled00/wled.h b/wled00/wled.h index 4cace88a9..19be1f4d7 100644 --- a/wled00/wled.h +++ b/wled00/wled.h @@ -570,7 +570,7 @@ WLED_GLOBAL uint16_t olen _INIT(0); WLED_GLOBAL size_t fsBytesUsed _INIT(0); WLED_GLOBAL size_t fsBytesTotal _INIT(0); WLED_GLOBAL unsigned long presetsModifiedTime _INIT(0L); -WLED_GLOBAL JsonDocument* fileDoc; +WLED_GLOBAL volatile JsonDocument* fileDoc; WLED_GLOBAL bool doCloseFile _INIT(false); // presets