From 44c1497e339b60e8fa6e07f24999f3450d70114b Mon Sep 17 00:00:00 2001 From: Alexey Yakovenko Date: Sun, 26 Sep 2010 10:44:55 +0200 Subject: don't try to resume session if file was opened from cmdline --- main.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'main.c') 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 (); -- cgit v1.2.3