diff options
| author | George Hazan <george.hazan@gmail.com> | 2013-09-25 10:58:24 +0000 |
|---|---|---|
| committer | George Hazan <george.hazan@gmail.com> | 2013-09-25 10:58:24 +0000 |
| commit | dd1460d664f7266920b07527f25f87ec8233daaf (patch) | |
| tree | 3753e6fa678edf1b3d9bb020bb97e16ca75ff69d /plugins/NewXstatusNotify | |
| parent | 9ff92d1cc83e39859891a65f5ada186806cef133 (diff) | |
valid options initialization
git-svn-id: http://svn.miranda-ng.org/main/trunk@6225 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
Diffstat (limited to 'plugins/NewXstatusNotify')
| -rw-r--r-- | plugins/NewXstatusNotify/src/indsnd.cpp | 21 | ||||
| -rw-r--r-- | plugins/NewXstatusNotify/src/options.cpp | 5 |
2 files changed, 10 insertions, 16 deletions
diff --git a/plugins/NewXstatusNotify/src/indsnd.cpp b/plugins/NewXstatusNotify/src/indsnd.cpp index d8e747d6e1..88754c3a99 100644 --- a/plugins/NewXstatusNotify/src/indsnd.cpp +++ b/plugins/NewXstatusNotify/src/indsnd.cpp @@ -325,18 +325,15 @@ INT_PTR CALLBACK DlgProcSoundUIPage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA int UserInfoInitialise(WPARAM wParam, LPARAM lParam)
{
- if (lParam == NULL)
- return 0;
-
- OPTIONSDIALOGPAGE odp = {0};
- odp.cbSize = sizeof(odp);
- odp.position = 100000000;
- odp.hInstance = hInst;
- odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_SOUNDS);
- odp.pszTitle = LPGEN("Status Notify");
- odp.pfnDlgProc = DlgProcSoundUIPage;
- UserInfo_AddPage(wParam, &odp);
-
+ if (lParam) {
+ OPTIONSDIALOGPAGE odp = { sizeof(odp) };
+ odp.position = 100000000;
+ odp.hInstance = hInst;
+ odp.pszTemplate = MAKEINTRESOURCEA(IDD_INFO_SOUNDS);
+ odp.pszTitle = LPGEN("Status Notify");
+ odp.pfnDlgProc = DlgProcSoundUIPage;
+ UserInfo_AddPage(wParam, &odp);
+ }
return 0;
}
diff --git a/plugins/NewXstatusNotify/src/options.cpp b/plugins/NewXstatusNotify/src/options.cpp index 4173d34f3d..3d1bcb0d6d 100644 --- a/plugins/NewXstatusNotify/src/options.cpp +++ b/plugins/NewXstatusNotify/src/options.cpp @@ -1024,9 +1024,7 @@ INT_PTR CALLBACK DlgProcXLogOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM l int OptionsInitialize(WPARAM wParam, LPARAM lParam)
{
- OPTIONSDIALOGPAGE odp = {0};
-
- odp.cbSize = sizeof(odp);
+ OPTIONSDIALOGPAGE odp = { sizeof(odp) };
odp.position = -100000000;
odp.hInstance = hInst;
odp.flags = ODPF_BOLDGROUPS;
@@ -1065,6 +1063,5 @@ int OptionsInitialize(WPARAM wParam, LPARAM lParam) odp.pfnDlgProc = DlgProcSMPopupOpts;
Options_AddPage(wParam, &odp);
}
-
return 0;
}
|