From 72809309e15b4866a431fa8ee1a846b98095a343 Mon Sep 17 00:00:00 2001
From: schroda <50052685+schroda@users.noreply.github.com>
Date: Tue, 24 Dec 2024 17:21:25 +0100
Subject: [PATCH] Always register reader hotkeys

The hotkeys were never registered e.g. while loading or in case an error occurred
---
 src/modules/reader/screens/Reader.tsx        | 40 ++++++++++----------
 src/modules/reader/services/ReaderService.ts |  4 +-
 2 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/modules/reader/screens/Reader.tsx b/src/modules/reader/screens/Reader.tsx
index b4a6c45e..5fd9085c 100644
--- a/src/modules/reader/screens/Reader.tsx
+++ b/src/modules/reader/screens/Reader.tsx
@@ -281,6 +281,7 @@ const BaseReader = ({
             status: true,
             value: (
                 <Box sx={{ position: 'absolute' }}>
+                    <ReaderHotkeys scrollElementRef={scrollElementRef} />
                     <ReaderOverlay isVisible={isOverlayVisible} />
                     {!scrollElementRef.current && (
                         <Box
@@ -360,27 +361,24 @@ const BaseReader = ({
     }
 
     return (
-        <>
-            <ReaderHotkeys scrollElementRef={scrollElementRef} />
-            <Box
-                sx={{
-                    position: 'relative',
-                    display: 'flex',
-                    flexDirection: 'column',
-                    width: `calc(100vw - ${readerNavBarWidth}px)`,
-                    height: `100vh`,
-                    marginLeft: `${readerNavBarWidth}px`,
-                    transition: (theme) =>
-                        `width 0.${theme.transitions.duration.shortest}s, margin-left 0.${theme.transitions.duration.shortest}s`,
-                    overflow: 'auto',
-                    backgroundColor: READER_BACKGROUND_TO_COLOR[backgroundColor],
-                }}
-            >
-                <ReaderViewer ref={scrollElementRef} />
-                <TapZoneLayout />
-                <ReaderRGBAFilter />
-            </Box>
-        </>
+        <Box
+            sx={{
+                position: 'relative',
+                display: 'flex',
+                flexDirection: 'column',
+                width: `calc(100vw - ${readerNavBarWidth}px)`,
+                height: `100vh`,
+                marginLeft: `${readerNavBarWidth}px`,
+                transition: (theme) =>
+                    `width 0.${theme.transitions.duration.shortest}s, margin-left 0.${theme.transitions.duration.shortest}s`,
+                overflow: 'auto',
+                backgroundColor: READER_BACKGROUND_TO_COLOR[backgroundColor],
+            }}
+        >
+            <ReaderViewer ref={scrollElementRef} />
+            <TapZoneLayout />
+            <ReaderRGBAFilter />
+        </Box>
     );
 };
 
diff --git a/src/modules/reader/services/ReaderService.ts b/src/modules/reader/services/ReaderService.ts
index 69285dcc..61c79d05 100644
--- a/src/modules/reader/services/ReaderService.ts
+++ b/src/modules/reader/services/ReaderService.ts
@@ -241,7 +241,7 @@ export class ReaderService {
         isGlobal: boolean = false,
         profile?: ReadingMode,
     ): void {
-        if (!manga) {
+        if (!manga || manga.id === -1) {
             return;
         }
         const key = getMetadataKey(setting, profile !== undefined ? [profile?.toString()] : undefined);
@@ -305,7 +305,7 @@ export class ReaderService {
         isGlobal: boolean = false,
         profile?: string,
     ): void {
-        if (!manga) {
+        if (!manga || manga.id === -1) {
             return;
         }