From kde-commits  Sun Aug 31 22:49:00 2008
From: Dan Meltzer <hydrogen () notyetimplemented ! com>
Date: Sun, 31 Aug 2008 22:49:00 +0000
To: kde-commits
Subject: extragear/multimedia/amarok/src
Message-Id: <1220222940.437192.31696.nullmailer () svn ! kde ! org>
X-MARC-Message: https://marc.info/?l=kde-commits&m=122022295005388

SVN commit 855508 by dmeltzer:

Oh, fine, we'll even use the proper variable name in the check so that amarok can compile

 M  +2 -2      App.cpp  


--- trunk/extragear/multimedia/amarok/src/App.cpp #855507:855508
@@ -600,7 +600,7 @@
     case Phonon::PlayingState:
         if ( oldState == Phonon::PausedState )
             Amarok::OSD::instance()->OSDWidget::show( i18nc( "state, as in playing", "Play" ) );
-        if ( !track->prettyName().isEmpty() )
+        if ( track && !track->prettyName().isEmpty() )
 //             //TODO: write a utility function somewhere
             mainWindow()->setPlainCaption( i18n( "%1 - %2 -  %3", track->artist() ? track->artist()->prettyName() : i18n( "Unknown"), track->prettyName(), AMAROK_CAPTION ) );
         break;
@@ -624,7 +624,7 @@
     DEBUG_BLOCK
 
     Meta::TrackPtr currentTrack = The::engineController()->currentTrack();
-    if( !track )
+    if( !currentTrack )
         return;
     Amarok::OSD::instance()->show( currentTrack );
     if( !trackChanged )