launcher: focus actual current wall

Also thumbnailer kill process before starting new proc

2 files changed, 4 insertions, 2 deletions

diff --git a/modules/launcher/WallpaperList.qml b/modules/launcher/WallpaperList.qml
index 430964e..b3a0fd7 100644
--- a/modules/launcher/WallpaperList.qml
+++ b/modules/launcher/WallpaperList.qml
@@ -20,10 +20,10 @@ PathView {
                 list.length -= 1; // Always show odd number
             return list;
         }
-        onValuesChanged: root.currentIndex = search ? 0 : values.findIndex(w => w.path === Wallpapers.current)
+        onValuesChanged: root.currentIndex = search ? 0 : values.findIndex(w => w.path === Wallpapers.actualCurrent)
     }
 
-    Component.onCompleted: currentIndex = Wallpapers.list.findIndex(w => w.path === Wallpapers.current)
+    Component.onCompleted: currentIndex = Wallpapers.list.findIndex(w => w.path === Wallpapers.actualCurrent)
     Component.onDestruction: Wallpapers.stopPreview()
 
     onCurrentItemChanged: {
diff --git a/services/Thumbnailer.qml b/services/Thumbnailer.qml
index 3bdcaf0..3b22ada 100644
--- a/services/Thumbnailer.qml
+++ b/services/Thumbnailer.qml
@@ -35,6 +35,7 @@ Singleton {
                 onRead: data => {
                     const sha = data.split(" ")[0];
                     obj.path = `${root.thumbDir}/${sha}@${obj.width}x${obj.height}-exact.png`;
+                    obj.thumbProc.signal(9);
                     obj.thumbProc.running = true;
                 }
             }
@@ -62,6 +63,7 @@ end`]
         }
 
         function reload(): void {
+            shaProc.signal(9);
             shaProc.running = true;
         }
     }