claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into feature/machine_and_kb

Browse Source
This commit is contained in:
OBattler
2021-09-19 14:47:15 +02:00
parent bb39e53fee 2ee154c362
commit 273e1a4cbe
5 changed files with 187 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/config.c
View File

@@ -505,7 +505,7 @@ load_general(void)
video_fullscreen_scale = config_get_int(cat, "video_fullscreen_scale", 0);
video_fullscreen_first = config_get_int(cat, "video_fullscreen_first", 0);
video_fullscreen_first = config_get_int(cat, "video_fullscreen_first", 1);
video_filter_method = config_get_int(cat, "video_filter_method", 1);
@@ -2024,6 +2024,7 @@ config_load(void)
gfxcard = video_get_video_from_internal_name("cga");
vid_api = plat_vidapi("default");
vid_resize = 0;
video_fullscreen_first = 1;
time_sync = TIME_SYNC_ENABLED;
hdc_current = hdc_get_from_internal_name("none");
serial_enabled[0] = 1;