Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Grooveshark: don't crash when receiving the reply for a canceled request.

Browse Source 
Mark all tasks as finished when removing all items, to prevent never ending task in case we disconnect or refresh before all replies have been received.
This commit is contained in:
Arnaud Bienner 2014-03-21 12:48:45 +01:00
parent fddb87ba63
commit 4520a1c115
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/internet/groovesharkservice.cpp
View File

@ -89,6 +89,7 @@ GroovesharkService::GroovesharkService(Application* app, InternetModel* parent)
: InternetService(kServiceName, app, parent, parent),
url_handler_(new GroovesharkUrlHandler(this, this)),
next_pending_search_id_(0),
next_pending_playlist_retrieve_id_(0),
root_(nullptr),
search_(nullptr),
popular_month_(nullptr),
@ -441,7 +442,12 @@ void GroovesharkService::RemoveItems() {
playlists_.clear();
subscribed_playlists_parent_ = nullptr;
subscribed_playlists_.clear();
// Cancel any pending requests and mark tasks as finished, in case they weren't
// finished yet.
pending_retrieve_playlists_.clear();
app_->task_manager()->SetTaskFinished(task_playlists_id_);
app_->task_manager()->SetTaskFinished(task_popular_id_);
app_->task_manager()->SetTaskFinished(task_search_id_);
}
void GroovesharkService::ResetSessionId() {
@ -713,9 +719,13 @@ void GroovesharkService::UserPlaylistsRetrieved(QNetworkReply* reply) {
}
void GroovesharkService::PlaylistSongsRetrieved(QNetworkReply* reply,
int playlist_id) {
int playlist_id, int request_id) {
reply->deleteLater();
pending_retrieve_playlists_.remove(playlist_id);
if (!pending_retrieve_playlists_.remove(request_id)) {
// This request has been canceled. Stop here
return;
}
PlaylistInfo* playlist_info = subscribed_playlists_.contains(playlist_id)
? &subscribed_playlists_[playlist_id]
: &playlists_[playlist_id];
@ -1263,10 +1273,12 @@ void GroovesharkService::RefreshPlaylist(int playlist_id) {
QList<Param> parameters;
parameters << Param("playlistID", playlist_id);
QNetworkReply* reply = CreateRequest("getPlaylistSongs", parameters);
NewClosure(reply, SIGNAL(finished()), this,
SLOT(PlaylistSongsRetrieved(QNetworkReply*, int)), reply,
playlist_id);
pending_retrieve_playlists_.insert(playlist_id);
int id = next_pending_playlist_retrieve_id_++;
NewClosure(reply, SIGNAL(finished()),
this, SLOT(PlaylistSongsRetrieved(QNetworkReply*, int, int)),
reply, playlist_id, id);
pending_retrieve_playlists_.insert(id);
}
void GroovesharkService::CreateNewPlaylist() {

3
src/internet/groovesharkservice.h
View File

@ -169,7 +169,7 @@ signals:
void PopularSongsTodayRetrieved(QNetworkReply* reply);
void SubscribedPlaylistsRetrieved(QNetworkReply* reply);
void AutoplayTagsRetrieved(QNetworkReply* reply);
void PlaylistSongsRetrieved(QNetworkReply* reply, int playlist_id);
void PlaylistSongsRetrieved(QNetworkReply* reply, int playlist_id, int request_id);
void PlaylistSongsSet(QNetworkReply* reply, int playlist_id, int task_id);
void CreateNewPlaylist();
void NewPlaylistCreated(QNetworkReply* reply, const QString& name);
@ -257,6 +257,7 @@ signals:
QString pending_search_;
int next_pending_search_id_;
int next_pending_playlist_retrieve_id_;
QSet<int> pending_retrieve_playlists_;