diff --git a/TTKModule/TTKCore/musicNetworkKits/bd/musicdownloadquerybdmoviethread.cpp b/TTKModule/TTKCore/musicNetworkKits/bd/musicdownloadquerybdmoviethread.cpp index 863205f309..e7e74e5c21 100644 --- a/TTKModule/TTKCore/musicNetworkKits/bd/musicdownloadquerybdmoviethread.cpp +++ b/TTKModule/TTKCore/musicNetworkKits/bd/musicdownloadquerybdmoviethread.cpp @@ -343,7 +343,12 @@ void MusicDownLoadQueryBDMovieThread::readFromMusicMVAttribute(MusicObject::Musi } value = value["files"].toMap(); + if(value.keys().isEmpty()) + { + return; + } value = value[value.keys().first()].toMap(); + QString path = value["file_link"].toString(); if(path.contains("video-url")) { diff --git a/TTKModule/TTKWidget/musicSearchKits/musiclocalsongsearchinlineedit.cpp b/TTKModule/TTKWidget/musicSearchKits/musiclocalsongsearchinlineedit.cpp index 2cccb7974d..29d3eda46d 100644 --- a/TTKModule/TTKWidget/musicSearchKits/musiclocalsongsearchinlineedit.cpp +++ b/TTKModule/TTKWidget/musicSearchKits/musiclocalsongsearchinlineedit.cpp @@ -62,6 +62,11 @@ void MusicLocalSongSearchInlineEdit::suggestDataChanged() if(m_popWidget && !text().trimmed().isEmpty()) { + if(names.isEmpty()) + { + m_popWidget->lower(); + m_popWidget->hide(); + } m_popWidget->createSuggestItems(names); } } diff --git a/TTKModule/musicapplication.cpp b/TTKModule/musicapplication.cpp index bda3058ca3..cef74046a1 100644 --- a/TTKModule/musicapplication.cpp +++ b/TTKModule/musicapplication.cpp @@ -180,6 +180,9 @@ void MusicApplication::musicLoadCurrentSongLrc() QString prefix = MusicUtils::Core::lrcPrefix(); QString path = QFile::exists(prefix + filename + LRC_FILE) ? (prefix + filename + LRC_FILE) : (prefix + filename + KRC_FILE); m_rightAreaWidget->loadCurrentSongLrc(filename, path); + + //reset current song lrc index. + QTimer::singleShot(MT_S2MS, this, SLOT(resetCurrentSongLrcIndex())); } void MusicApplication::musicImportSongsSettingPath(const QStringList &items) @@ -968,6 +971,16 @@ void MusicApplication::musicCurrentLrcUpdated() m_rightAreaWidget->musicCheckHasLrcAlready(); } +void MusicApplication::resetCurrentSongLrcIndex() +{ + int pos = m_musicPlayer->position(); + if(pos != -1) + { + //Set lrc corrent to show + m_rightAreaWidget->setSongSpeedAndSlow(pos); + } +} + void MusicApplication::updateCurrentTime(qint64 pos) { if(!m_playControl) ///When pause just resume it diff --git a/TTKModule/musicapplication.h b/TTKModule/musicapplication.h index c68f80729a..a0bfeacd1e 100644 --- a/TTKModule/musicapplication.h +++ b/TTKModule/musicapplication.h @@ -279,6 +279,10 @@ public Q_SLOTS: * The current lrc should update, emit it. */ void musicCurrentLrcUpdated(); + /*! + * Reset current song lrc index. + */ + void resetCurrentSongLrcIndex(); /*! * Update current play time when user adjust the progress. */