aboutsummaryrefslogtreecommitdiff
path: root/src/plugins/General/scrobbler/scrobbler.cpp
diff options
context:
space:
mode:
authortrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2016-06-03 18:35:50 +0000
committertrialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38>2016-06-03 18:35:50 +0000
commit05960e955b0cbaabfc21eb8ec69973ad00663cc1 (patch)
treea9e7cbfec8f6e283bf468c2316e2b215e70ad932 /src/plugins/General/scrobbler/scrobbler.cpp
parent920827d0600f57187f5b55891acb27733a24fed2 (diff)
downloadqmmp-05960e955b0cbaabfc21eb8ec69973ad00663cc1.tar.gz
qmmp-05960e955b0cbaabfc21eb8ec69973ad00663cc1.tar.bz2
qmmp-05960e955b0cbaabfc21eb8ec69973ad00663cc1.zip
scrobbler: fixed regression
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6431 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/General/scrobbler/scrobbler.cpp')
-rw-r--r--src/plugins/General/scrobbler/scrobbler.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/plugins/General/scrobbler/scrobbler.cpp b/src/plugins/General/scrobbler/scrobbler.cpp
index 8b251f354..905f3c425 100644
--- a/src/plugins/General/scrobbler/scrobbler.cpp
+++ b/src/plugins/General/scrobbler/scrobbler.cpp
@@ -141,7 +141,8 @@ void Scrobbler::setState(Qmmp::State state)
m_elapsed += m_time->elapsed();
m_elapsed /= 1000; //convert to seconds
- if((m_elapsed > 240) || (m_elapsed > int(m_song.length()/2) && m_song.length() > MIN_SONG_LENGTH))
+ if((m_elapsed > 240) || (m_elapsed > MIN_SONG_LENGTH && m_song.length() == 0) ||
+ (m_elapsed > int(m_song.length()/2) && m_song.length() > MIN_SONG_LENGTH))
{
m_cachedSongs << m_song;
m_cache->save(m_cachedSongs);
@@ -163,7 +164,8 @@ void Scrobbler::updateMetaData()
if(!m_song.metaData().isEmpty() && m_song.metaData() != metadata)
{
int elapsed = (m_elapsed + m_time->elapsed()) / 1000;
- if((elapsed > 240) || (elapsed > int(m_song.length()/2) && m_song.length() > MIN_SONG_LENGTH))
+ if((elapsed > 240) || (elapsed > MIN_SONG_LENGTH && m_song.length() == 0) ||
+ (elapsed > int(m_song.length()/2) && m_song.length() > MIN_SONG_LENGTH))
{
m_cachedSongs << m_song;
m_cache->save(m_cachedSongs);