diff options
| author | George Hazan <george.hazan@gmail.com> | 2014-03-13 14:53:37 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2014-03-13 14:53:37 +0000 |
| commit | 0bb008ece12fe4e261330a3f680e2f481bfd3e91 (patch) | |
| tree | 0e9acb2b0ac74fb21871e9cb6e9a6283651bee46 | |
| parent | 6c2593659f36866e8c82deea995428c61bb99ec3 (diff) | |
warning fix
git-svn-id: http://svn.miranda-ng.org/main/trunk@8593 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp | 2 | ||||
| -rw-r--r-- | plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp index d482099de3..f3a01450af 100644 --- a/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDInput.cpp @@ -658,7 +658,7 @@ void CLCDInput::UpdateOffsets(int iModified) GetTextExtentExPoint(hDC,pszText+iChar,iLen-iChar,GetWidth(),&iMaxChars,piWidths,&sizeLine);
pos = m_strText.find(_T("\n"),iChar);
// check for linebreaks
- if(pos != tstring::npos & pos >= iChar && pos <= iChar + iMaxChars)
+ if(pos != tstring::npos && pos >= iChar && pos <= iChar + iMaxChars)
{
iWordOffset = pos + 1;
iMaxChars = pos - iChar;
diff --git a/plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp b/plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp index 6451f76665..e2680a364f 100644 --- a/plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp +++ b/plugins/MirandaG15/src/LCDFramework/CLCDLabel.cpp @@ -173,7 +173,7 @@ void CLCDLabel::UpdateCutOffIndex() {
// find the last space in the line ( substract -1 from offset to ignore spaces as last chars )
pos = m_strText.rfind(_T(" "),i + iMaxChars -1 );
- if(pos != tstring::npos && pos != i && pos >= i & pos != i+iMaxChars)
+ if(pos != tstring::npos && pos != i && pos >= i && pos != i+iMaxChars)
iMaxChars = 1 + pos - i;
}
|