aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.in2
-rw-r--r--xbmc/playlists/SmartPlayList.cpp2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure.in b/configure.in
index 806680f355..b5ac25e2ad 100644
--- a/configure.in
+++ b/configure.in
@@ -1534,7 +1534,7 @@ if test "$use_librtmp" != "no"; then
XB_FIND_SONAME([RTMP], [rtmp], [use_librtmp])
AC_DEFINE([HAS_LIBRTMP], [1], [Whether to use libRTMP library.])
RTMP_ALL_LIBS=$(${PKG_CONFIG} --static --libs-only-l --silence-errors librtmp)
- test "$use_static_ffmpeg" = "yes" && LIBS="$LIBS $RTMP_ALL_LIBS"],
+ test "$use_static_ffmpeg" = "yes" && LIBS="$LIBS $RTMP_ALL_LIBS"; LIBS="`echo $LIBS | sed 's/-lrtmp//g'`"],
[AC_CHECK_HEADERS([librtmp/log.h librtmp/amf.h librtmp/rtmp.h],,
[if test "$use_librtmp" = "yes"; then
AC_MSG_ERROR($librtmp_not_found)
diff --git a/xbmc/playlists/SmartPlayList.cpp b/xbmc/playlists/SmartPlayList.cpp
index 8a426d0fdd..035bb0a783 100644
--- a/xbmc/playlists/SmartPlayList.cpp
+++ b/xbmc/playlists/SmartPlayList.cpp
@@ -706,7 +706,7 @@ CStdString CSmartPlaylistRule::FormatWhereClause(const CStdString &negate, const
else if (m_field == FieldArtist)
query = negate + " EXISTS (SELECT 1 FROM song_artist, artist WHERE song_artist.idSong = " + GetField(FieldId, strType) + " AND song_artist.idArtist = artist.idArtist AND artist.strArtist" + parameter + ")";
else if (m_field == FieldAlbumArtist)
- query = negate + " EXISTS (SELECT 1 FROM album_artist, artist WHERE album_artist.idAlbum = " + table + "idAlbum AND album_artist.idArtist = artist.idArtist AND artist.strArtist" + parameter + ")";
+ query = negate + " EXISTS (SELECT 1 FROM album_artist, artist WHERE album_artist.idAlbum = " + table + ".idAlbum AND album_artist.idArtist = artist.idArtist AND artist.strArtist" + parameter + ")";
else if (m_field == FieldLastPlayed && (m_operator == OPERATOR_LESS_THAN || m_operator == OPERATOR_BEFORE || m_operator == OPERATOR_NOT_IN_THE_LAST))
query = GetField(m_field, strType) + " is NULL or " + GetField(m_field, strType) + parameter;
}