From 6595bcfc3cc1e93599258fc440aed4d4de314620 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Wed, 13 Jun 2018 22:26:11 +0200 Subject: [PATCH] fix models list reload after USB mass storage connection (#5963) --- radio/src/storage/modelslist.cpp | 1 + radio/src/storage/sdcard_raw.cpp | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/radio/src/storage/modelslist.cpp b/radio/src/storage/modelslist.cpp index acd47dd69..3e842b7d5 100644 --- a/radio/src/storage/modelslist.cpp +++ b/radio/src/storage/modelslist.cpp @@ -293,6 +293,7 @@ void ModelsList::clear() delete *it; } categories.clear(); + init(); } bool ModelsList::load() diff --git a/radio/src/storage/sdcard_raw.cpp b/radio/src/storage/sdcard_raw.cpp index 877f9ee7c..eab5fa71a 100644 --- a/radio/src/storage/sdcard_raw.cpp +++ b/radio/src/storage/sdcard_raw.cpp @@ -207,6 +207,11 @@ void storageReadAll() createModel(); } + // Wipe models list in case + // it's being reloaded after USB connection + modelslist.clear(); + + // and reload the list modelslist.load(); } -- 2.11.4.GIT