Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
mirror of https://github.com/clementine-player/Clementine synced 2024-12-19 04:52:30 +01:00
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
David Sansome 2011-04-29 21:49:48 +00:00
parent d3d2a3184b
commit a2ceca673c
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/Version.cmake
View File

@ -3,7 +3,7 @@
# Version numbers. # Version numbers.
set(CLEMENTINE_VERSION_MAJOR 0) set(CLEMENTINE_VERSION_MAJOR 0)
set(CLEMENTINE_VERSION_MINOR 7) set(CLEMENTINE_VERSION_MINOR 7)
#set(CLEMENTINE_VERSION_PATCH 0) set(CLEMENTINE_VERSION_PATCH 1)
#set(CLEMENTINE_VERSION_PRERELEASE rc1) #set(CLEMENTINE_VERSION_PRERELEASE rc1)
# This should be set to OFF in an svn tag # This should be set to OFF in an svn tag

7
src/radio/spotifyservice.cpp
View File

@ -131,6 +131,12 @@ void SpotifyService::BlobProcessError(QProcess::ProcessError error) {
qLog(Error) << "Spotify blob process failed:" << error; qLog(Error) << "Spotify blob process failed:" << error;
blob_process_->deleteLater(); blob_process_->deleteLater();
blob_process_ = NULL; 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, void SpotifyService::EnsureServerCreated(const QString& username,
@ -223,6 +229,7 @@ void SpotifyService::StartBlobProcess() {
delete blob_process_; delete blob_process_;
blob_process_ = new QProcess(this); blob_process_ = new QProcess(this);
blob_process_->setProcessChannelMode(QProcess::ForwardedChannels); blob_process_->setProcessChannelMode(QProcess::ForwardedChannels);
blob_process_->setProcessEnvironment(env);
connect(blob_process_, connect(blob_process_,
SIGNAL(error(QProcess::ProcessError)), SIGNAL(error(QProcess::ProcessError)),