Skip to content

Commit 25d219b

Browse files
fix(shell): improve way to obtain icon_bitmap and support onecommander
1 parent 8b6a570 commit 25d219b

File tree

1 file changed

+2
-4
lines changed

1 file changed

+2
-4
lines changed

src/shell/contextmenu/contextmenu.cc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,16 +224,14 @@ menu menu::construct_with_hmenu(
224224
}
225225
}
226226

227-
if (info.fType & MFT_BITMAP) {
227+
if (info.hbmpItem) {
228228
item.icon_bitmap = (size_t)info.hbmpItem;
229229
} else if (info.hbmpChecked || info.hbmpUnchecked) {
230230
if (info.fState & MFS_CHECKED)
231231
item.icon_bitmap = (size_t)info.hbmpChecked;
232232
else
233233
item.icon_bitmap = (size_t)info.hbmpUnchecked;
234-
}
235-
236-
if (info.dwItemData) {
234+
} else if (info.dwItemData) {
237235
HBITMAP result{};
238236

239237
if (!IS_INTRESOURCE(info.dwItemData)) {

0 commit comments

Comments
 (0)