From d98360d3fe986719e2e7b7d3d95c9e35d67a8250 Mon Sep 17 00:00:00 2001
From: Nite <shunite@gmail.com>
Date: Sat, 28 Nov 2020 13:51:51 +0100
Subject: [PATCH] Really fixed getSectionName

---
 .../org/moire/ultrasonic/activity/ArtistRowAdapter.kt     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ArtistRowAdapter.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ArtistRowAdapter.kt
index 5c289c8b..28105012 100644
--- a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ArtistRowAdapter.kt
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/activity/ArtistRowAdapter.kt
@@ -143,7 +143,13 @@ class ArtistRowAdapter(
     }
 
     override fun getSectionName(position: Int): String {
-        return getSectionFromName(artistList[position].name ?: " ")
+        var listPosition = if (shouldShowHeader) position - 1 else position
+
+        // Show the first artist's initial in the popup when the list is
+        // scrolled up to the "Select Folder" row
+        if (listPosition < 0) listPosition = 0
+
+        return getSectionFromName(artistList[listPosition].name ?: " ")
     }
 
     private fun getSectionForArtist(artistPosition: Int): String {