From 7c862bb56c10a32edbf38e3843549678a71309c9 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 30 May 2016 10:25:24 +0000 Subject: fix for a nasty bug with bitmap filters git-svn-id: http://svn.miranda-ng.org/main/trunk@16888 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- src/mir_core/src/bitmaps.cpp | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/src/mir_core/src/bitmaps.cpp b/src/mir_core/src/bitmaps.cpp index ad0fa71d2c..ee964c482c 100644 --- a/src/mir_core/src/bitmaps.cpp +++ b/src/mir_core/src/bitmaps.cpp @@ -42,13 +42,11 @@ MIR_CORE_DLL(void) Bitmap_GetFilter(TCHAR *dest, size_t destLen) if (dest == NULL) return; - CMString filter; - filter.AppendFormat(_T("%s (*.bmp;*.jpg;*.gif;*.png)%c*.BMP;*.RLE;*.JPG;*.JPEG;*.GIF;*.PNG%c"), TranslateT("All Files"), 0, 0); - filter.AppendFormat(_T("%s (*.bmp;*.rle)%c*.BMP;*.RLE%c"), TranslateT("Windows bitmaps"), 0, 0); - filter.AppendFormat(_T("%s (*.jpg;*.jpeg)%c*.JPG;*.JPEG%c"), TranslateT("JPEG bitmaps"), 0, 0); - filter.AppendFormat(_T("%s (*.gif)%c*.GIF%c"), TranslateT("GIF bitmaps"), 0, 0); - filter.AppendFormat(_T("%s (*.png)%c*.PNG%c"), TranslateT("PNG bitmaps"), 0, 0); - filter.AppendChar(0); - - _tcsncpy_s(dest, destLen, filter, filter.GetLength()); + mir_sntprintf(dest, destLen, + _T("%s (*.bmp;*.jpg;*.gif;*.png)%c*.BMP;*.RLE;*.JPG;*.JPEG;*.GIF;*.PNG%c") + _T("%s (*.bmp;*.rle)%c*.BMP;*.RLE%c") + _T("%s (*.jpg;*.jpeg)%c*.JPG;*.JPEG%c") + _T("%s (*.gif)%c*.GIF%c") + _T("%s (*.png)%c*.PNG%c%c"), + TranslateT("All Files"), 0, 0, TranslateT("Windows bitmaps"), 0, 0, TranslateT("JPEG bitmaps"), 0, 0, TranslateT("GIF bitmaps"), 0, 0, TranslateT("PNG bitmaps"), 0, 0, 0); } -- cgit v1.2.3