diff options
| -rw-r--r-- | plugins/Clist_modern/src/modern_clist.h | 2 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/modern_skinbutton.cpp | 4 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/modern_skinopt.cpp | 2 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/stdafx.h | 5 |
4 files changed, 7 insertions, 6 deletions
diff --git a/plugins/Clist_modern/src/modern_clist.h b/plugins/Clist_modern/src/modern_clist.h index edce2c60a6..fc9e6e3695 100644 --- a/plugins/Clist_modern/src/modern_clist.h +++ b/plugins/Clist_modern/src/modern_clist.h @@ -96,7 +96,7 @@ struct ClcCacheEntry : public ClcCacheEntryBase DWORD dwLastMsgTime;
int __forceinline getStatus() const
- { return (this == NULL) ? ID_STATUS_OFFLINE : m_iStatus;
+ { return m_iStatus;
}
};
diff --git a/plugins/Clist_modern/src/modern_skinbutton.cpp b/plugins/Clist_modern/src/modern_skinbutton.cpp index a57e469d8f..d0062aecd5 100644 --- a/plugins/Clist_modern/src/modern_skinbutton.cpp +++ b/plugins/Clist_modern/src/modern_skinbutton.cpp @@ -558,8 +558,8 @@ int ModernSkinButton_AddButton(HWND parent, bct->HandleService = mir_strdup(HandeService); bct->CommandService = mir_strdup(CommandService); bct->StateService = mir_strdup(StateDefService); - if (DBkey && &DBkey != '\0') bct->ValueDBSection = mir_strdup(DBkey); else bct->ValueDBSection = NULL; - if (TypeDef && &TypeDef != '\0') bct->ValueTypeDef = mir_strdup(TypeDef); else bct->ValueTypeDef = mir_strdup("sDefault"); + if (DBkey && *DBkey != '\0') bct->ValueDBSection = mir_strdup(DBkey); else bct->ValueDBSection = NULL; + if (TypeDef && *TypeDef != '\0') bct->ValueTypeDef = mir_strdup(TypeDef); else bct->ValueTypeDef = mir_strdup("sDefault"); bct->ID = mir_strdup(ID); bct->Hint = mir_tstrdup(Hint); Buttons[ButtonsCount].bct = bct; diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp index 138b229cf3..9612aa02e5 100644 --- a/plugins/Clist_modern/src/modern_skinopt.cpp +++ b/plugins/Clist_modern/src/modern_skinopt.cpp @@ -116,7 +116,7 @@ INT_PTR CALLBACK DlgSkinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara sd = (SkinListData*)(tvi.lParam); } if (!sd) return 0; - if (sd->File && !_tcschr(sd->File, _T('%'))) { + if (!_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); diff --git a/plugins/Clist_modern/src/stdafx.h b/plugins/Clist_modern/src/stdafx.h index dd9534c389..21abdf4975 100644 --- a/plugins/Clist_modern/src/stdafx.h +++ b/plugins/Clist_modern/src/stdafx.h @@ -26,11 +26,11 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
#pragma once
-
+/*
#ifndef DB_USEHELPERFUNCTIONS // to supress static inline db helpers
#define DB_NOHELPERFUNCTIONS
#endif
-
+*/
#ifndef _CRT_SECURE_NO_WARNINGS
#define _CRT_SECURE_NO_WARNINGS // to suppress secure warnings in VC2005
#endif
@@ -300,6 +300,7 @@ public: {
_strKey = _strdup(hsKey._strKey);
_dwKey = hsKey._dwKey;
+ return *this;
}
#ifdef _UNICODE
|