summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVadim Dashevskiy <watcherhd@gmail.com>2014-04-22 07:19:39 +0000
committerVadim Dashevskiy <watcherhd@gmail.com>2014-04-22 07:19:39 +0000
commitb1a320efe397ead4f7b053f3f3b4edc2edd962f9 (patch)
tree4f3b1efc46ff9ad825742db4090cb06908e9bc7f
parentedec24a567015d4d8de6b4d65a0aaaad5f456459 (diff)
compilation fix (by Mataes)
git-svn-id: http://svn.miranda-ng.org/main/trunk@9035 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--plugins/MirOTR/MirOTR/src/utils.cpp12
1 files 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;