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

Merge pull request #1437 from ts-korhonen/master

Browse Source 
Move cpu_override warning dialog after main window is created so that…
This commit is contained in:
Miran Grča
2021-05-10 23:21:32 +02:00
committed by GitHub
parent c7e3b69731 e4eef4a1b2
commit 483dd06080
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/win/win_ui.c
View File

@@ -1339,11 +1339,6 @@ ui_init(int nCmdShow)
} }
#endif #endif
/* Warn the user about unsupported configs. */
if (cpu_override && ui_msgbox_ex(MBX_WARNING | MBX_QUESTION_OK, (void *) IDS_2145, (void *) IDS_2146, (void *) IDS_2147, (void *) IDS_2119, NULL)) {
return(0);
}
/* Create our main window's class and register it. */ /* Create our main window's class and register it. */
wincl.hInstance = hinstance; wincl.hInstance = hinstance;
wincl.lpszClassName = CLASS_NAME; wincl.lpszClassName = CLASS_NAME;
@@ -1438,6 +1433,13 @@ ui_init(int nCmdShow)
/* Make the window visible on the screen. */ /* Make the window visible on the screen. */
ShowWindow(hwnd, nCmdShow); ShowWindow(hwnd, nCmdShow);
/* Warn the user about unsupported configs. */
if (cpu_override && ui_msgbox_ex(MBX_WARNING | MBX_QUESTION_OK, (void*)IDS_2145, (void*)IDS_2146, (void*)IDS_2147, (void*)IDS_2119, NULL))
{
DestroyWindow(hwnd);
return(0);
}
GetClipCursor(&oldclip); GetClipCursor(&oldclip);
/* Initialize the RawInput (keyboard) module. */ /* Initialize the RawInput (keyboard) module. */