Only load info when needed
This commit is contained in:
@@ -183,10 +183,9 @@ void SleepActivity::onEnter() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void SleepActivity::renderCustomSleepScreen() const {
|
void SleepActivity::renderCustomSleepScreen() const {
|
||||||
const BookOverlayInfo overlayInfo =
|
const BookOverlayInfo overlayInfo{};
|
||||||
(SETTINGS.sleepCoverOverlay != 0 && APP_STATE.lastSleepFromReader && !APP_STATE.openEpubPath.empty())
|
const bool shouldLoadOverlayInfo =
|
||||||
? getBookOverlayInfo(APP_STATE.openEpubPath)
|
SETTINGS.sleepCoverOverlay != 0 && APP_STATE.lastSleepFromReader && !APP_STATE.openEpubPath.empty();
|
||||||
: BookOverlayInfo{};
|
|
||||||
|
|
||||||
// Check if we have a /.sleep (preferred) or /sleep directory
|
// Check if we have a /.sleep (preferred) or /sleep directory
|
||||||
const char* sleepDir = nullptr;
|
const char* sleepDir = nullptr;
|
||||||
@@ -248,7 +247,9 @@ void SleepActivity::renderCustomSleepScreen() const {
|
|||||||
delay(100);
|
delay(100);
|
||||||
Bitmap bitmap(file, true);
|
Bitmap bitmap(file, true);
|
||||||
if (bitmap.parseHeaders() == BmpReaderError::Ok) {
|
if (bitmap.parseHeaders() == BmpReaderError::Ok) {
|
||||||
renderBitmapSleepScreen(bitmap, overlayInfo);
|
const BookOverlayInfo resolvedOverlayInfo =
|
||||||
|
shouldLoadOverlayInfo ? getBookOverlayInfo(APP_STATE.openEpubPath) : overlayInfo;
|
||||||
|
renderBitmapSleepScreen(bitmap, resolvedOverlayInfo);
|
||||||
file.close();
|
file.close();
|
||||||
dir.close();
|
dir.close();
|
||||||
return;
|
return;
|
||||||
@@ -266,7 +267,9 @@ void SleepActivity::renderCustomSleepScreen() const {
|
|||||||
Bitmap bitmap(file, true);
|
Bitmap bitmap(file, true);
|
||||||
if (bitmap.parseHeaders() == BmpReaderError::Ok) {
|
if (bitmap.parseHeaders() == BmpReaderError::Ok) {
|
||||||
LOG_DBG("SLP", "Loading: /sleep.bmp");
|
LOG_DBG("SLP", "Loading: /sleep.bmp");
|
||||||
renderBitmapSleepScreen(bitmap, overlayInfo);
|
const BookOverlayInfo resolvedOverlayInfo =
|
||||||
|
shouldLoadOverlayInfo ? getBookOverlayInfo(APP_STATE.openEpubPath) : overlayInfo;
|
||||||
|
renderBitmapSleepScreen(bitmap, resolvedOverlayInfo);
|
||||||
file.close();
|
file.close();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user