summaryrefslogtreecommitdiff
path: root/main.c
diff options
context:
space:
mode:
authorGravatar Alexey Yakovenko <wakeroid@gmail.com>2010-09-26 10:44:55 +0200
committerGravatar Alexey Yakovenko <wakeroid@gmail.com>2010-09-26 10:44:55 +0200
commit44c1497e339b60e8fa6e07f24999f3450d70114b (patch)
treeb5ff790a229b9c23e5ec7fb889e3e1947bc672b5 /main.c
parent4d9a30cf352bc32da1aefccb2ba244baaaa57461 (diff)
don't try to resume session if file was opened from cmdline
Diffstat (limited to 'main.c')
-rw-r--r--main.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/main.c b/main.c
index ea4256ec..e8b85c37 100644
--- a/main.c
+++ b/main.c
@@ -503,6 +503,7 @@ save_resume_state (void) {
void
restore_resume_state (void) {
if (conf_get_int ("resume_last_session", 0) && p_isstopped ()) {
+ conf_set_int ("resume_last_session", 0);
int plt = conf_get_int ("resume.playlist", -1);
int track = conf_get_int ("resume.track", -1);
float pos = conf_get_float ("resume.position", -1);
@@ -711,7 +712,9 @@ main (int argc, char *argv[]) {
streamer_init ();
- restore_resume_state ();
+ if (!noloadpl) {
+ restore_resume_state ();
+ }
// this runs in main thread (blocks right here)
player_mainloop ();