summaryrefslogtreecommitdiffstats
path: root/player/client.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2018-03-09 04:07:34 +0100
committerKevin Mitchell <kevmitch@gmail.com>2018-03-15 00:00:04 -0700
commitb2073d08b0913aa7eaa4c2e6c59e880104b3c346 (patch)
tree4b4d6248f4010e387b63ea7e847526d5cc95a58d /player/client.c
parent0c2f11cee62cb88b37b1986effbd58e407a972bf (diff)
downloadmpv-b2073d08b0913aa7eaa4c2e6c59e880104b3c346.tar.bz2
mpv-b2073d08b0913aa7eaa4c2e6c59e880104b3c346.tar.xz
player: shuffle around CLI exit code handling
Remove the weird prepare_exit_cplayer() function, and fold the contents into mpv_main() and mp_initialize().
Diffstat (limited to 'player/client.c')
-rw-r--r--player/client.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/player/client.c b/player/client.c
index a8b90082cc..21c6807ad3 100644
--- a/player/client.c
+++ b/player/client.c
@@ -543,7 +543,7 @@ int mpv_initialize(mpv_handle *ctx)
int res = 0;
void *args[2] = {ctx->mpctx, &res};
mp_dispatch_run(ctx->mpctx->dispatch, doinit, args);
- return res < 0 ? MPV_ERROR_INVALID_PARAMETER : 0;
+ return res == 0 ? 0 : MPV_ERROR_INVALID_PARAMETER;
}
// set ev->data to a new copy of the original data