From 2e97b27ffa97b575d9e9438ae80fbee9bfbaf6e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ed=C3=AAnis=20Freindorfer=20Azevedo?= Date: Mon, 15 Jul 2019 09:48:03 -0300 Subject: [PATCH] Use --config option to load configuration file. --- src/sdl/SDL.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/sdl/SDL.cpp b/src/sdl/SDL.cpp index 48cfc24b..9fcea840 100644 --- a/src/sdl/SDL.cpp +++ b/src/sdl/SDL.cpp @@ -1689,6 +1689,9 @@ int main(int argc, char** argv) gb_effects_config.surround = false; gb_effects_config.enabled = false; + ReadOpts(argc, argv); + LoadConfig(); // Parse command line arguments (overrides ini) + inputSetKeymap(PAD_1, KEY_LEFT, ReadPrefHex("Joy0_Left")); inputSetKeymap(PAD_1, KEY_RIGHT, ReadPrefHex("Joy0_Right")); inputSetKeymap(PAD_1, KEY_UP, ReadPrefHex("Joy0_Up")); @@ -1750,9 +1753,6 @@ int main(int argc, char** argv) inputSetMotionKeymap(KEY_UP, ReadPrefHex("Motion_Up")); inputSetMotionKeymap(KEY_DOWN, ReadPrefHex("Motion_Down")); - LoadConfig(); // Parse command line arguments (overrides ini) - ReadOpts(argc, argv); - if (!sdlCheckDirectory(screenShotDir)) screenShotDir = NULL; if (!sdlCheckDirectory(saveDir))