From a2ceca673cd1633ddbf3c4b384db20e52b7587e7 Mon Sep 17 00:00:00 2001 From: David Sansome Date: Fri, 29 Apr 2011 21:49:48 +0000 Subject: [PATCH] Bump trunk's version to 0.7.1 (oops), show an error when the spotify blob crashes, actually use the LD_LIBRARY_PATH that is created --- cmake/Version.cmake | 2 +- src/radio/spotifyservice.cpp | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/cmake/Version.cmake b/cmake/Version.cmake index aa794e221..3a0f0a08d 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -3,7 +3,7 @@ # Version numbers. set(CLEMENTINE_VERSION_MAJOR 0) set(CLEMENTINE_VERSION_MINOR 7) -#set(CLEMENTINE_VERSION_PATCH 0) +set(CLEMENTINE_VERSION_PATCH 1) #set(CLEMENTINE_VERSION_PRERELEASE rc1) # This should be set to OFF in an svn tag diff --git a/src/radio/spotifyservice.cpp b/src/radio/spotifyservice.cpp index 04d115e4e..efae7d773 100644 --- a/src/radio/spotifyservice.cpp +++ b/src/radio/spotifyservice.cpp @@ -131,6 +131,12 @@ void SpotifyService::BlobProcessError(QProcess::ProcessError error) { qLog(Error) << "Spotify blob process failed:" << error; blob_process_->deleteLater(); blob_process_ = NULL; + + emit StreamError("The Spotify process failed"); + + if (login_task_id_) { + model()->task_manager()->SetTaskFinished(login_task_id_); + } } void SpotifyService::EnsureServerCreated(const QString& username, @@ -223,6 +229,7 @@ void SpotifyService::StartBlobProcess() { delete blob_process_; blob_process_ = new QProcess(this); blob_process_->setProcessChannelMode(QProcess::ForwardedChannels); + blob_process_->setProcessEnvironment(env); connect(blob_process_, SIGNAL(error(QProcess::ProcessError)),