Fix Windows 7 bug where icon doesn't load

vanjac · Aug 25, 2023 · 179e13f · 179e13f
1 parent 1dbceb0
commit 179e13f
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/src/ItemWindow.cpp b/src/ItemWindow.cpp
@@ -1876,6 +1876,11 @@ void ItemWindow::IconThread::run() {
     SHFILEINFO fileInfo = {};
     checkLE(SHGetFileInfo((wchar_t *)(ITEMIDLIST *)itemIDList, 0, &fileInfo, sizeof(fileInfo),
         SHGFI_PIDL | SHGFI_ICON | SHGFI_ADDOVERLAYS | SHGFI_SMALLICON));
+    if (fileInfo.hIcon == nullptr) {
+        // bug (possibly windows 7 only?) where the first call sometimes fails
+        checkLE(SHGetFileInfo((wchar_t *)(ITEMIDLIST *)itemIDList, 0, &fileInfo, sizeof(fileInfo),
+            SHGFI_PIDL | SHGFI_ICON | SHGFI_ADDOVERLAYS | SHGFI_SMALLICON));
+    }
     HICON hIconSmall = fileInfo.hIcon;
     checkLE(SHGetFileInfo((wchar_t *)(ITEMIDLIST *)itemIDList, 0, &fileInfo, sizeof(fileInfo),
         SHGFI_PIDL | SHGFI_ICON | SHGFI_ADDOVERLAYS | SHGFI_LARGEICON));