diff --git a/cmake/Version.cmake b/cmake/Version.cmake index 018efe5aa..c2a1ff63d 100644 --- a/cmake/Version.cmake +++ b/cmake/Version.cmake @@ -7,13 +7,14 @@ set(CLEMENTINE_VERSION_PATCH 3) include(FindSubversion) -find_package(Subversion) -if(SUBVERSION_FOUND) - Subversion_WC_INFO(${PROJECT_SOURCE_DIR} clementine) - set(BUILDBOT_REVISION ${clementine_WC_REVISION}) -else(SUBVERSION_FOUND) - set(BUILDBOT_REVISION $ENV{BUILDBOT_REVISION}) -endif(SUBVERSION_FOUND) +set(BUILDBOT_REVISION $ENV{BUILDBOT_REVISION}) +if(NOT BUILDBOT_REVISION) + find_package(Subversion) + if(SUBVERSION_FOUND) + Subversion_WC_INFO(${PROJECT_SOURCE_DIR} clementine) + set(BUILDBOT_REVISION ${clementine_WC_REVISION}) + endif(SUBVERSION_FOUND) +endif(NOT BUILDBOT_REVISION) if(BUILDBOT_REVISION) set(CLEMENTINE_VERSION_STRING "${CLEMENTINE_VERSION_MAJOR}.${CLEMENTINE_VERSION_MINOR} r${BUILDBOT_REVISION}") # Displayed in GUIs diff --git a/src/radio/jamendoservice.cpp b/src/radio/jamendoservice.cpp index 28431dbf6..b6250cf95 100644 --- a/src/radio/jamendoservice.cpp +++ b/src/radio/jamendoservice.cpp @@ -280,8 +280,6 @@ Song JamendoService::ReadTrack(const QString& artist, } void JamendoService::ParseDirectoryFinished() { - QFutureWatcher* watcher = static_cast*>(sender()); - model()->task_manager()->SetTaskFinished(load_database_task_id_); load_database_task_id_ = 0; }