diff options
authorwm4 <wm4@nowhere>2014-10-10 14:27:45 +0200
committerwm4 <wm4@nowhere>2014-10-10 14:27:45 +0200
commitd4b2a96d90249dd435679a6f24af2248b1f8dd0b (patch)
parent26bc6b48313dd0470a3998dace217148fc314271 (diff)
Revert "player: --save-position-on-quit should always work"
This reverts commit 45c8b97efbaff7a5031b008223eeed56f7b0607a. Some else complained (github issue #1163). The feature requested in #1148 will be implemented differently in the following commit.
3 files changed, 5 insertions, 8 deletions
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
index 1c49d6754a..59c934a7c3 100644
--- a/DOCS/man/options.rst
+++ b/DOCS/man/options.rst
@@ -290,9 +290,10 @@ Program Behavior
Always save the current playback position on quit. When this file is
played again later, the player will seek to the old playback position on
- start. This happens when playback is stopped in any way by the user.
- For example, going to the next file in the playlist will save the position,
- and resume playback at thr same position the next time the file is played.
+ start. This does not happen if playback of a file is stopped in any other
+ way than quitting. For example, going to the next file in the playlist
+ will not save the position, and start playback at beginning the next time
+ the file is played.
This behavior is disabled by default, but is always available when quitting
the player with Shift+Q.
diff --git a/player/core.h b/player/core.h
index 31e2657e93..f16cca166d 100644
--- a/player/core.h
+++ b/player/core.h
@@ -41,10 +41,6 @@ enum stop_play_reason {
PT_QUIT, // stop playback, quit player
-// stop_play_reason that is an explicit user abort.
-#define PT_IS_QUIT(x) ((x) == PT_NEXT_ENTRY || (x) == PT_CURRENT_ENTRY || \
- (x) == PT_STOP || (x) == PT_QUIT)
enum exit_reason {
diff --git a/player/loadfile.c b/player/loadfile.c
index bcaebf14a4..ac1d765619 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -1194,7 +1194,7 @@ terminate_playback:
if (mpctx->stop_play != AT_END_OF_FILE)
- if (opts->position_save_on_quit && PT_IS_QUIT(mpctx->stop_play))
+ if (opts->position_save_on_quit && mpctx->stop_play == PT_QUIT)
if (mpctx->step_frames)