80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge branch '86Box:master' into master

Browse Source
This commit is contained in:
dob205
2021-11-19 15:22:15 +01:00
committed by GitHub
parent 22c633950e 26c6fd13c8
commit d6bc83e0aa
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/win/win_ui.c
View File

@@ -1270,6 +1270,9 @@ ui_init(int nCmdShow)
tdconfig.pButtons = tdbuttons; tdconfig.pButtons = tdbuttons;
tdconfig.pfCallback = TaskDialogProcedure; tdconfig.pfCallback = TaskDialogProcedure;
/* Load the desired iconset */
win_load_icon_set();
/* Start settings-only mode if requested. */ /* Start settings-only mode if requested. */
if (settings_only) { if (settings_only) {
if (! pc_init_modules()) { if (! pc_init_modules()) {
@@ -1404,9 +1407,6 @@ ui_init(int nCmdShow)
ResetAllMenus(); ResetAllMenus();
media_menu_init(); media_menu_init();
/* Load the desired iconset */
win_load_icon_set();
/* Make the window visible on the screen. */ /* Make the window visible on the screen. */
ShowWindow(hwnd, nCmdShow); ShowWindow(hwnd, nCmdShow);