mirror of
https://github.com/tomahawk-player/tomahawk.git
synced 2025-08-08 07:07:05 +02:00
* Don't overwrite friendlyname with an empty one.
This commit is contained in:
@@ -249,8 +249,8 @@ DatabaseCommand_SetDynamicPlaylistRevision::exec( DatabaseImpl* lib )
|
|||||||
|
|
||||||
controlsQuery.exec();
|
controlsQuery.exec();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if ( m_applied )
|
if ( m_applied )
|
||||||
{
|
{
|
||||||
tLog() << "updating dynamic playlist, optimistic locking okay";
|
tLog() << "updating dynamic playlist, optimistic locking okay";
|
||||||
|
@@ -146,6 +146,9 @@ Source::avatar( AvatarStyle style ) const
|
|||||||
void
|
void
|
||||||
Source::setFriendlyName( const QString& fname )
|
Source::setFriendlyName( const QString& fname )
|
||||||
{
|
{
|
||||||
|
if ( fname.isEmpty() )
|
||||||
|
return;
|
||||||
|
|
||||||
m_friendlyname = fname;
|
m_friendlyname = fname;
|
||||||
if ( m_scrubFriendlyName )
|
if ( m_scrubFriendlyName )
|
||||||
m_friendlyname = m_friendlyname.split( "@" ).first();
|
m_friendlyname = m_friendlyname.split( "@" ).first();
|
||||||
|
Reference in New Issue
Block a user