diff options
| author | wm4 <wm4@nowhere> | 2014-06-26 17:56:47 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2014-06-26 19:37:26 +0200 |
| commit | c63378d41cdb004bac8e400bef8f3e73c5123de7 (patch) | |
| tree | 08e396fe81823943bb5f25f4ddfbec0250e46045 /player/main.c | |
| parent | cb250d490c14872f03bb0320179e48d05fe2539d (diff) | |
| download | mpv-c63378d41cdb004bac8e400bef8f3e73c5123de7.tar.bz2 mpv-c63378d41cdb004bac8e400bef8f3e73c5123de7.tar.xz | |
player: remove some minor code duplication in config loader code
It's better to keep the logic in one place.
Also drop that a broken config file aborts loading of the player. I
don't see much reason for this, and it inflates the code slightly.
Diffstat (limited to 'player/main.c')
| -rw-r--r-- | player/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/player/main.c b/player/main.c index e2b15f6dbc..0a18df1a4e 100644 --- a/player/main.c +++ b/player/main.c @@ -491,8 +491,7 @@ int mpv_main(int argc, char *argv[]) mp_print_version(mpctx->log, false); - if (!mp_parse_cfgfiles(mpctx)) - exit_player(mpctx, EXIT_ERROR); + mp_parse_cfgfiles(mpctx); int r = m_config_parse_mp_command_line(mpctx->mconfig, mpctx->playlist, mpctx->global, argc, argv); |