From cd92a3c2a990400c263cab0ecbc2f78c1b8f1723 Mon Sep 17 00:00:00 2001 From: Wolfgang Rohdewald Date: Sun, 11 Jan 2009 23:10:50 +0100 Subject: fix previous commit: mv must not run in background. --- lyrics.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lyrics.c b/lyrics.c index d7822d2..ff051b4 100644 --- a/lyrics.c +++ b/lyrics.c @@ -63,7 +63,7 @@ mgLyrics::SaveExternal() { string tmp=item->getCachedFilename("lyrics.tmp"); PlayerControl()->CurrentItem()->resetHasLyricsFile(); char *cmd; - msprintf(&cmd, "mv -f \"%s\" \"%s\" >/dev/null 2>&1 & ", tmp.c_str(), local.c_str()); + msprintf(&cmd, "mv -f \"%s\" \"%s\" >/dev/null 2>&1", tmp.c_str(), local.c_str()); mgDebug(1,"muggle[%d]: lyrics: Executing %s\n",getpid(), cmd); if (!SystemExec(cmd)) { BlueAction=actLoadExternalLyrics; @@ -76,6 +76,7 @@ void mgLyrics::ThrowTmpAway(const mgItemGd& item) { char *cmd; msprintf(&cmd,"rm -f \"%s\"",item.getCachedFilename("lyrics.tmp").c_str()); + mgDebug(5,"muggle[%d]: lyrics: ThrowTmpAway: Executing %s\n",getpid(), cmd); SystemExec(cmd); free(cmd); state=lyricsSaved; @@ -114,6 +115,7 @@ mgLyrics::Process(eKeys key) { state=lyricsSaved; } } + key = kNone; } } else if (displayItem!=playItem) { if (normfound) { -- cgit v1.2.3