diff options
-rw-r--r-- | src/modules/options/headerbar.cpp | 2 | ||||
-rw-r--r-- | src/modules/options/iconheader.cpp | 1 | ||||
-rw-r--r-- | src/modules/protocols/protoint.cpp | 6 |
3 files changed, 2 insertions, 7 deletions
diff --git a/src/modules/options/headerbar.cpp b/src/modules/options/headerbar.cpp index f3d19c8bdc..c643a4732d 100644 --- a/src/modules/options/headerbar.cpp +++ b/src/modules/options/headerbar.cpp @@ -290,8 +290,6 @@ static LRESULT CALLBACK MHeaderbarWndProc(HWND hwndDlg, UINT msg, WPARAM wParam switch(msg) {
case WM_NCCREATE:
itc = new MHeaderbarCtrl; //(MHeaderbarCtrl*)mir_alloc(sizeof(MHeaderbarCtrl));
- if (itc == NULL)
- return FALSE;
SetWindowLongPtr(hwndDlg, 0, (LONG_PTR)itc);
MHeaderbar_SetupColors(itc);
diff --git a/src/modules/options/iconheader.cpp b/src/modules/options/iconheader.cpp index d9d6f9deb6..2d58d47f16 100644 --- a/src/modules/options/iconheader.cpp +++ b/src/modules/options/iconheader.cpp @@ -323,7 +323,6 @@ static LRESULT CALLBACK MIcoTabWndProc(HWND hwndDlg, UINT msg, WPARAM wParam, L switch(msg) {
case WM_NCCREATE:
itc = new MIcoTabCtrl; //(MIcoTabCtrl*)mir_alloc(sizeof(MIcoTabCtrl));
- if (itc == NULL) return FALSE;
itc->nSelectedIdx = -1;
itc->nHotIdx = -1;
itc->bMouseInside = FALSE;
diff --git a/src/modules/protocols/protoint.cpp b/src/modules/protocols/protoint.cpp index e97f25c38d..bbe6a01e19 100644 --- a/src/modules/protocols/protoint.cpp +++ b/src/modules/protocols/protoint.cpp @@ -265,10 +265,8 @@ struct DEFAULT_PROTO_INTERFACE : public PROTO_INTERFACE PROTO_INTERFACE* AddDefaultAccount(const char* szProtoName)
{
PROTO_INTERFACE* ppi = new DEFAULT_PROTO_INTERFACE;
- if (ppi != NULL) {
- ppi->m_szModuleName = mir_strdup(szProtoName);
- ppi->m_tszUserName = mir_a2t(szProtoName);
- }
+ ppi->m_szModuleName = mir_strdup(szProtoName);
+ ppi->m_tszUserName = mir_a2t(szProtoName);
return ppi;
}
|