standalone: load per-game config from cmd line too

notaz/pcsx_rearmed#163

diff --git a/frontend/main.c b/frontend/main.c
index e1141d6..d98ad00 100644 (file)
--- a/frontend/main.c
+++ b/frontend/main.c
@@ -715,6 +715,8 @@ int main(int argc, char *argv[])
        }
 
        if (ready_to_go) {
+               if (menu_load_config(1) != 0)
+                       menu_load_config(0);
                menu_prepare_emu();
 
                // If a state has been specified, then load that

diff --git a/frontend/menu.c b/frontend/menu.c
index 0ca76d9..c8ad771 100644 (file)
--- a/frontend/menu.c
+++ b/frontend/menu.c
@@ -591,7 +591,7 @@ static void parse_str_val(char *cval, const char *src)
 
 static void keys_load_all(const char *cfg);
 
-static int menu_load_config(int is_game)
+int menu_load_config(int is_game)
 {
        char cfgfile[MAXPATHLEN];
        int i, ret = -1;

diff --git a/frontend/menu.h b/frontend/menu.h
index 8f5acda..9d60e88 100644 (file)
--- a/frontend/menu.h
+++ b/frontend/menu.h
@@ -7,6 +7,7 @@ void menu_loop(void);
 void menu_finish(void);
 
 void menu_notify_mode_change(int w, int h, int bpp);
+int  menu_load_config(int is_game);
 
 enum g_opts_opts {
        OPT_SHOWFPS = 1 << 0,