summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunK <electricityispower@gmail.com>2008-08-27 21:29:46 +0200
committerunK <electricityispower@gmail.com>2008-08-27 21:29:46 +0200
commit71cf9e9521329fdd57f8748ffd04038a42957d9d (patch)
treed817bb1e99fceee62df003eee848bce4eba8a67f
parentae7d1a09857b5baf57757481b659b15e888fac8b (diff)
more fixes + version bump0.2.1
-rw-r--r--configure.in2
-rw-r--r--src/ncmpcpp.cpp2
-rw-r--r--src/status_checker.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/configure.in b/configure.in
index 5d55d7fb..9442df50 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
AC_INIT(configure.in)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(ncmpcpp, 0.2)
+AM_INIT_AUTOMAKE(ncmpcpp, 0.2.1)
AC_PREREQ(2.59)
diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp
index d5bdf087..ab8b1e9e 100644
--- a/src/ncmpcpp.cpp
+++ b/src/ncmpcpp.cpp
@@ -1322,7 +1322,7 @@ int main(int argc, char *argv[])
{
LOCK_STATUSBAR;
wFooter->WriteXY(0, Config.statusbar_visibility, "Add: ", 1);
- string path = wFooter->GetString("");
+ string path = wFooter->GetString("", TraceMpdStatus);
UNLOCK_STATUSBAR;
if (!path.empty())
{
diff --git a/src/status_checker.cpp b/src/status_checker.cpp
index 70327418..66864b66 100644
--- a/src/status_checker.cpp
+++ b/src/status_checker.cpp
@@ -327,7 +327,7 @@ void NcmpcppStatusChanged(MPDConnection *Mpd, MPDStatusChanges changed, void *da
{
if (!mPlaylist->Empty())
{
- if (Config.repeat_one_mode && repeat_one_allowed && (old_playing+1 == now_playing || old_playing-vPlaylist.size()+1 == now_playing))
+ if (Config.repeat_one_mode && repeat_one_allowed && (old_playing+1 == now_playing || !now_playing))
{
std::swap<int>(now_playing,old_playing);
Mpd->Play(now_playing);
@@ -357,7 +357,7 @@ void NcmpcppStatusChanged(MPDConnection *Mpd, MPDStatusChanges changed, void *da
int elapsed = Mpd->GetElapsedTime();
// 'repeat one' mode check - be sure that we deal with item with known length
- if (Mpd->GetCurrentSong().GetTotalLength() && elapsed == Mpd->GetCurrentSong().GetTotalLength())
+ if (Mpd->GetCurrentSong().GetTotalLength() && elapsed == Mpd->GetCurrentSong().GetTotalLength()-1)
repeat_one_allowed = 1;
if (!block_statusbar_update && Config.statusbar_visibility)