diff options
| author | George Hazan <george.hazan@gmail.com> | 2015-08-17 19:39:01 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2015-08-17 19:39:01 +0000 |
| commit | 4a6b3a2acf91421a958b9946e15a149cac29e7b5 (patch) | |
| tree | 88860b2bf9b9a85c932c7dd2c2e73445d200745c /plugins/Clist_modern/src/modern_skinopt.cpp | |
| parent | d0ceb5768ff3146499a0318ffe03c867c0845592 (diff) | |
warning fixes
git-svn-id: http://svn.miranda-ng.org/main/trunk@14980 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/Clist_modern/src/modern_skinopt.cpp')
| -rw-r--r-- | plugins/Clist_modern/src/modern_skinopt.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp index 34ca2187cb..4e95804f4e 100644 --- a/plugins/Clist_modern/src/modern_skinopt.cpp +++ b/plugins/Clist_modern/src/modern_skinopt.cpp @@ -262,7 +262,7 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara InvalidateRect(GetDlgItem(hwndDlg, IDC_PREVIEW), NULL, TRUE); else { //prepare text TCHAR Author[255], URL[MAX_PATH], Contact[255], Description[400], text[2000]; - SkinListData* sd = NULL; + SkinListData* sd2 = NULL; HTREEITEM hti = TreeView_GetSelection(GetDlgItem(hwndDlg, IDC_TREE1)); if (hti == 0) return 0; { @@ -270,17 +270,17 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara tvi.hItem = hti; tvi.mask = TVIF_HANDLE | TVIF_PARAM; TreeView_GetItem(GetDlgItem(hwndDlg, IDC_TREE1), &tvi); - sd = (SkinListData*)(tvi.lParam); + sd2 = (SkinListData*)(tvi.lParam); } - if (!sd) return 0; + if (!sd2) return 0; - if (sd->File && !_tcschr(sd->File, _T('%'))) { - GetPrivateProfileString(_T("Skin_Description_Section"), _T("Author"), TranslateT("( unknown )"), Author, _countof(Author), sd->File); - GetPrivateProfileString(_T("Skin_Description_Section"), _T("URL"), _T(""), URL, _countof(URL), sd->File); - GetPrivateProfileString(_T("Skin_Description_Section"), _T("Contact"), _T(""), Contact, _countof(Contact), sd->File); - GetPrivateProfileString(_T("Skin_Description_Section"), _T("Description"), _T(""), Description, _countof(Description), sd->File); + if (sd2->File && !_tcschr(sd2->File, _T('%'))) { + GetPrivateProfileString(_T("Skin_Description_Section"), _T("Author"), TranslateT("( unknown )"), Author, _countof(Author), sd2->File); + GetPrivateProfileString(_T("Skin_Description_Section"), _T("URL"), _T(""), URL, _countof(URL), sd2->File); + GetPrivateProfileString(_T("Skin_Description_Section"), _T("Contact"), _T(""), Contact, _countof(Contact), sd2->File); + GetPrivateProfileString(_T("Skin_Description_Section"), _T("Description"), _T(""), Description, _countof(Description), sd2->File); mir_sntprintf(text, TranslateT("Preview is not available\n\n%s\n----------------------\n\n%s\n\nAUTHOR(S):\n%s\n\nCONTACT:\n%s\n\nHOMEPAGE:\n%s"), - sd->Name, Description, Author, Contact, URL); + sd2->Name, Description, Author, Contact, URL); } else { mir_sntprintf(text, TranslateT("%s\n\n%s\n\nAUTHORS:\n%s\n\nCONTACT:\n%s\n\nWEB:\n%s\n\n\n"), @@ -443,11 +443,11 @@ HTREEITEM FindChild(HWND hTree, HTREEITEM Parent, TCHAR * Caption, void * data) if (!data) return tmp; - TVITEM tvi = { 0 }; - tvi.hItem = tmp; - tvi.mask = TVIF_HANDLE | TVIF_PARAM; - TreeView_GetItem(hTree, &tvi); - SkinListData *sd = (SkinListData*)tvi.lParam; + TVITEM tvi2 = { 0 }; + tvi2.hItem = tmp; + tvi2.mask = TVIF_HANDLE | TVIF_PARAM; + TreeView_GetItem(hTree, &tvi2); + SkinListData *sd = (SkinListData*)tvi2.lParam; if (sd) if (!mir_tstrcmpi(sd->File, ((SkinListData*)data)->File)) return tmp; |