From 1781b1895c583f7d5767e2376681695c7a618083 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 28 May 2021 21:22:16 +0300 Subject: =?UTF-8?q?fixes=20#2890=20(QuickSearch:=20=D0=BF=D1=83=D1=81?= =?UTF-8?q?=D1=82=D1=8B=D0=B5=20=D1=81=D1=82=D1=80=D0=BE=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B2=20=D0=B2=D1=8B=D0=BF=D0=B0=D0=B4=D0=B0=D1=8E=D1=89=D0=B5?= =?UTF-8?q?=D0=BC=20=D0=BC=D0=B5=D0=BD=D1=8E)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/QuickSearch/src/options.cpp | 3 ++- plugins/QuickSearch/src/utils.cpp | 2 +- plugins/QuickSearch/src/version.h | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) (limited to 'plugins/QuickSearch/src') diff --git a/plugins/QuickSearch/src/options.cpp b/plugins/QuickSearch/src/options.cpp index eb9ad28ec4..e2d42a6061 100644 --- a/plugins/QuickSearch/src/options.cpp +++ b/plugins/QuickSearch/src/options.cpp @@ -263,7 +263,8 @@ public: cmbOther.SetCurSel(0); for (int i = CNF_FIRSTNAME; i < CNF_MAX; i++) - cmbCnfType.AddString(cnf2str(i), i); + if (auto *pwszText = cnf2str(i)) + cmbCnfType.AddString(pwszText, i); cmbCnfType.SetCurSel(0); chkDrawGrid.SetState((g_plugin.m_flags & QSO_DRAWGRID) != 0); diff --git a/plugins/QuickSearch/src/utils.cpp b/plugins/QuickSearch/src/utils.cpp index a1eda87eae..930329c3ee 100644 --- a/plugins/QuickSearch/src/utils.cpp +++ b/plugins/QuickSearch/src/utils.cpp @@ -494,7 +494,7 @@ const wchar_t* cnf2str(int cnf) case CNF_COHOMEPAGE: return TranslateT("Company homepage"); case CNF_DISPLAYUID: return TranslateT("Display ID"); } - return L""; + return nullptr; } ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/plugins/QuickSearch/src/version.h b/plugins/QuickSearch/src/version.h index c33e010d53..1aede2783a 100644 --- a/plugins/QuickSearch/src/version.h +++ b/plugins/QuickSearch/src/version.h @@ -1,7 +1,7 @@ #define __MAJOR_VERSION 1 #define __MINOR_VERSION 5 #define __RELEASE_NUM 0 -#define __BUILD_NUM 2 +#define __BUILD_NUM 3 #include -- cgit v1.2.3