From 0013447068dfde42c60fa802e5387e9bc4d0b2e2 Mon Sep 17 00:00:00 2001 From: Sean Hall Date: Wed, 10 Nov 2021 14:37:55 -0600 Subject: Move ImageList element back under Theme since it's not a control. --- src/libs/dutil/WixToolset.DUtil/thmutil.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/libs/dutil/WixToolset.DUtil/thmutil.cpp') diff --git a/src/libs/dutil/WixToolset.DUtil/thmutil.cpp b/src/libs/dutil/WixToolset.DUtil/thmutil.cpp index b76d6483..b5dfbae4 100644 --- a/src/libs/dutil/WixToolset.DUtil/thmutil.cpp +++ b/src/libs/dutil/WixToolset.DUtil/thmutil.cpp @@ -1834,6 +1834,10 @@ static HRESULT ParseTheme( hr = ParseImages(hModule, wzRelativePath, pThemeElement, pTheme); ThmExitOnFailure(hr, "Failed to parse theme images."); + // Parse any image lists. + hr = ParseImageLists(hModule, wzRelativePath, pThemeElement, pTheme); + ThmExitOnFailure(hr, "Failed to parse image lists."); + // Parse the window element. hr = ParseWindow(hModule, wzRelativePath, pThemeElement, pTheme); ThmExitOnFailure(hr, "Failed to parse theme window element."); @@ -2598,10 +2602,6 @@ static HRESULT ParseWindow( ThmExitWithRootFailure(hr, E_INVALIDDATA, "Window elements must contain either the Caption or StringId attribute."); } - // Parse any image lists. - hr = ParseImageLists(hModule, wzRelativePath, pixn, pTheme); - ThmExitOnFailure(hr, "Failed to parse image lists."); - // Parse the pages. hr = ParsePages(hModule, wzRelativePath, pixn, pTheme); ThmExitOnFailure(hr, "Failed to parse theme pages."); -- cgit v1.2.3-55-g6feb