From b1a320efe397ead4f7b053f3f3b4edc2edd962f9 Mon Sep 17 00:00:00 2001 From: Vadim Dashevskiy Date: Tue, 22 Apr 2014 07:19:39 +0000 Subject: compilation fix (by Mataes) git-svn-id: http://svn.miranda-ng.org/main/trunk@9035 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/MirOTR/MirOTR/src/utils.cpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/plugins/MirOTR/MirOTR/src/utils.cpp b/plugins/MirOTR/MirOTR/src/utils.cpp index 03fdbcac7a..0adebc46e5 100644 --- a/plugins/MirOTR/MirOTR/src/utils.cpp +++ b/plugins/MirOTR/MirOTR/src/utils.cpp @@ -186,14 +186,10 @@ void ShowPopup(const TCHAR* line1, const TCHAR* line2, int timeout, const MCONTA if(line1 && line2) { _tcsncpy( ppd.lptzContactName, line1, MAX_CONTACTNAME-1 ); _tcsncpy( ppd.lptzText, line2, MAX_SECONDLINE-1 ); - } else if(line1) { - if (PUIsSecondLineShown()) _tcsncpy( ppd.lptzText, line1, MAX_SECONDLINE-1 ); - else _tcsncpy( ppd.lptzContactName, line1, MAX_CONTACTNAME-1 ); - } - else if(line2) { - if (PUIsSecondLineShown()) _tcsncpy( ppd.lptzText, line2, MAX_SECONDLINE-1 ); - else _tcsncpy( ppd.lptzContactName, line2, MAX_CONTACTNAME-1 ); - } + } else if(line1) + _tcsncpy( ppd.lptzText, line1, MAX_SECONDLINE-1 ); + else if(line2) + _tcsncpy( ppd.lptzText, line2, MAX_SECONDLINE-1 ); ppd.iSeconds = timeout; -- cgit v1.2.3