From cb75790202c93e71b82df84c4cec6d2f1a82d61a Mon Sep 17 00:00:00 2001
From: Awkward <Awkward@1316c22d-e87f-b044-9b9b-93d7a3e3ba9c>
Date: Thu, 1 May 2014 17:03:40 +0000
Subject: LastFM error message fix New file recognize fix

git-svn-id: http://svn.miranda-ng.org/main/trunk@9101 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/Watrack/lastfm/i_last_api.inc | 2 +-
 plugins/Watrack/watrack.dpr           | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/plugins/Watrack/lastfm/i_last_api.inc b/plugins/Watrack/lastfm/i_last_api.inc
index f09b93441b..b43ba0703c 100644
--- a/plugins/Watrack/lastfm/i_last_api.inc
+++ b/plugins/Watrack/lastfm/i_last_api.inc
@@ -80,7 +80,7 @@ begin
       else if StrCmp(res,'BADAUTH' )=0 then StrCopy(tmp,Translate('Bad Auth. Check login and password'))
       else if StrCmp(res,'BADTIME' )=0 then StrCopy(tmp,Translate('Bad TimeStamp'))
       else if StrCmp(res,'FAILED',6)=0 then StrCopy(tmp,res+7);
-      CallService(MS_POPUP_SHOWMESSAGEW,wparam(@request),SM_ERROR);
+      CallService(MS_POPUP_SHOWMESSAGE,wparam(@request),SM_ERROR);
     end;
     mFreeMem(res);
   end;
diff --git a/plugins/Watrack/watrack.dpr b/plugins/Watrack/watrack.dpr
index 5b2c5c753d..95dcd7a5b9 100644
--- a/plugins/Watrack/watrack.dpr
+++ b/plugins/Watrack/watrack.dpr
@@ -21,9 +21,9 @@ uses
   ,status    in 'status\status.pas'
   ,tmpl      in 'status\tmpl.pas'
   ,templates in 'templates\templates.pas'
-{$IFDEF KOL_MCK}
+{.$IFDEF KOL_MCK}
   ,kolframe  in 'kolframe\kolframe.pas'
-{$ENDIF}
+{.$ENDIF}
   {$include lst_players.inc}
   {$include lst_formats.inc}
 ;
@@ -252,8 +252,10 @@ begin
            isContainer(WorkSI.mfile))) then      // ... or container like CUE
         begin
           // requirement: old artist/title for remote files
-          result:=GetInfo(WorkSI,flags);
           newtrack:=result=WAT_RES_NEWFILE;
+          result:=GetInfo(WorkSI,flags);
+          if not newtrack then
+            newtrack:=result=WAT_RES_NEWFILE;
         end;
       end;
     end;
-- 
cgit v1.2.3