From 27c2bc1b2db09f3ad9c4f69e7719c5e7c5b94336 Mon Sep 17 00:00:00 2001
From: Leo Franchi <lfranchi@kde.org>
Date: Tue, 20 Sep 2011 11:26:17 -0400
Subject: [PATCH] CLean up some logic

---
 src/sourcetree/sourcetreeview.cpp | 34 +++++++++++++++----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/sourcetree/sourcetreeview.cpp b/src/sourcetree/sourcetreeview.cpp
index 2b74dc156..78f8d4666 100644
--- a/src/sourcetree/sourcetreeview.cpp
+++ b/src/sourcetree/sourcetreeview.cpp
@@ -372,6 +372,10 @@ SourceTreeView::latchOn()
 void
 SourceTreeView::playlistChanged( PlaylistInterface* newInterface )
 {
+    // If we were latched on and changed, send the listening along stop
+    if ( m_latch.isNull() )
+        return;
+
     const PlaylistInterface* pi = AudioEngine::instance()->playlist();
     bool listeningAlong = false;
     source_ptr newSource;
@@ -386,26 +390,22 @@ SourceTreeView::playlistChanged( PlaylistInterface* newInterface )
         }
     }
 
-    // If we were latched on and changed, send the listening along stop
-    if ( !m_latch.isNull() )
-    {
-        SourcePlaylistInterface* origsourcepi = dynamic_cast< SourcePlaylistInterface* >( m_latch.data() );
-        Q_ASSERT( origsourcepi );
-        const source_ptr source = origsourcepi->source();
+    SourcePlaylistInterface* origsourcepi = dynamic_cast< SourcePlaylistInterface* >( m_latch.data() );
+    Q_ASSERT( origsourcepi );
+    const source_ptr source = origsourcepi->source();
 
-        // if we're currently listening along to the same source, no change
-        if ( listeningAlong && ( !origsourcepi->source().isNull() && origsourcepi->source()->id() == newSource->id() ) )
-            return;
+    // if we're currently listening along to the same source, no change
+    if ( listeningAlong && ( !origsourcepi->source().isNull() && origsourcepi->source()->id() == newSource->id() ) )
+        return;
 
-        DatabaseCommand_SocialAction* cmd = new DatabaseCommand_SocialAction();
-        cmd->setSource( SourceList::instance()->getLocal() );
-        cmd->setAction( "latchOff");
-        cmd->setComment( source->userName() );
-        cmd->setTimestamp( QDateTime::currentDateTime().toTime_t() );
-        Database::instance()->enqueue( QSharedPointer< DatabaseCommand >( cmd ) );
+    DatabaseCommand_SocialAction* cmd = new DatabaseCommand_SocialAction();
+    cmd->setSource( SourceList::instance()->getLocal() );
+    cmd->setAction( "latchOff");
+    cmd->setComment( source->userName() );
+    cmd->setTimestamp( QDateTime::currentDateTime().toTime_t() );
+    Database::instance()->enqueue( QSharedPointer< DatabaseCommand >( cmd ) );
 
-        m_latch.clear();
-    }
+    m_latch.clear();
 }
 
 void