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

Merge branch 'qt' of https://github.com/jgilje/86Box into qt

Browse Source
This commit is contained in:
ts-korhonen
2021-12-12 14:12:11 +02:00
parent 1a2e1fd105 c77fc79e79
commit 1f408a1ac6
18 changed files with 711 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/qt/qt_main.cpp
View File

@@ -97,7 +97,7 @@ int main(int argc, char* argv[]) {
pc_init(argc, argv);
if (! pc_init_modules()) {
ui_msgbox_header(MBX_FATAL, VC(L"No ROMs found."), VC(L"86Box could not find any usable ROM images.\n\nPlease download a ROM set and extract it into the \"roms\" directory."));
ui_msgbox_header(MBX_FATAL, VC(L"No ROMs found."), VC(L"86Box could not find any usable ROM images.\n\nPlease <a href='https://github.com/86Box/roms/releases/latest'>download</a> a ROM set and extract it into the \"roms\" directory."));
return 6;
}
@@ -135,7 +135,6 @@ int main(int argc, char* argv[]) {
onesec.start(1000);
/* Initialize the rendering window, or fullscreen. */
QTimer::singleShot(50, []() { plat_resize(640, 480); } );
auto main_thread = std::thread([] {
main_thread_fn();
});