The-Homebrew-Cloud/uae-wii
2
0
Fork 0
mirror of https://github.com/Oibaf66/uae-wii.git synced 2024-11-14 23:05:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

command parsing after conf file loading, argument without "-" loads df0, fixed in emulation menu

Browse Source
This commit is contained in:
fabio.olimpieri 2013-01-12 10:19:24 +00:00
parent a643ce7965
commit 2b2f7577bc
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui-sdl/gui-sdl.c
View File

@ -435,11 +435,11 @@ static int get_gfx_aspect_ratio(void)
/* Helpers to determine the accuracy */
static int get_emulation_accuracy(void)
{
if (currprefs.cpu_compatible == 0 &&
currprefs.cpu_cycle_exact == 0)
if (changed_prefs.cpu_compatible == 0 &&
changed_prefs.cpu_cycle_exact == 0)
return 0;
if (currprefs.cpu_compatible == 1 &&
currprefs.cpu_cycle_exact == 0)
if (changed_prefs.cpu_compatible == 1 &&
changed_prefs.cpu_cycle_exact == 0)
return 1;
return 2;
}

4
src/main.c
View File

@ -493,6 +493,7 @@ static void parse_cmdline (int argc, char **argv)
if (parse_cmdline_option (&currprefs, argv[i][1], (char*)arg) && extra_arg)
i++;
}
else strncpy (currprefs.df[0], argv[1], 255); currprefs.df[0][255] = 0; //Load the argument without - in df0
}
}
}
@ -561,10 +562,11 @@ static void parse_cmdline_and_init_file (int argc, char **argv)
#endif
}
parse_cmdline (argc, argv);
cfgfile_load (&currprefs, SAVEDFILENAME, 0);
cfgfile_load (&currprefs, USERFILENAME, 0);
parse_cmdline (argc, argv);
fix_options ();
}