1
0
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:
Christian Muehlhaeuser
2011-11-21 18:03:54 +01:00
parent 40248965be
commit 83d48c99aa
2 changed files with 4 additions and 1 deletions

View File

@@ -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";

View File

@@ -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();