diff options
| author | George Hazan <ghazan@miranda.im> | 2018-03-04 15:34:41 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-03-04 15:34:41 +0300 |
| commit | ad28480e2efbe5f2ae573f22a28433147f48bf81 (patch) | |
| tree | e7069faa76995a096df42d3050939de2310cbb5e /plugins/StatusManager/src/StartupStatus | |
| parent | f02ba61c1480c33b801aa7f7acefac9e3735c551 (diff) | |
code cleaning
Diffstat (limited to 'plugins/StatusManager/src/StartupStatus')
| -rw-r--r-- | plugins/StatusManager/src/StartupStatus/ss_profiles.cpp | 8 | ||||
| -rw-r--r-- | plugins/StatusManager/src/StartupStatus/startupstatus.cpp | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/StatusManager/src/StartupStatus/ss_profiles.cpp b/plugins/StatusManager/src/StartupStatus/ss_profiles.cpp index 608cface96..2aba9ad8d8 100644 --- a/plugins/StatusManager/src/StartupStatus/ss_profiles.cpp +++ b/plugins/StatusManager/src/StartupStatus/ss_profiles.cpp @@ -197,16 +197,16 @@ INT_PTR LoadAndSetProfile(WPARAM iProfileNo, LPARAM) { // wParam == profile no. int profile = (int)iProfileNo; - TProtoSettings profileSettings = protoList; - if (!GetProfile(profile, profileSettings)) { + TProtoSettings ps(protoList); + if (!GetProfile(profile, ps)) { profile = (profile >= 0) ? profile : db_get_w(0, SSMODULENAME, SETTING_DEFAULTPROFILE, 0); char setting[64]; mir_snprintf(setting, "%d_%s", profile, SETTING_SHOWCONFIRMDIALOG); if (!db_get_b(0, SSMODULENAME, setting, 0)) - CallService(MS_CS_SETSTATUSEX, (WPARAM)&profileSettings, 0); + CallService(MS_CS_SETSTATUSEX, (WPARAM)&ps, 0); else - ShowConfirmDialogEx((TProtoSettings*)&profileSettings, db_get_dw(0, SSMODULENAME, SETTING_DLGTIMEOUT, 5)); + ShowConfirmDialogEx(&ps, db_get_dw(0, SSMODULENAME, SETTING_DLGTIMEOUT, 5)); } // add timer here diff --git a/plugins/StatusManager/src/StartupStatus/startupstatus.cpp b/plugins/StatusManager/src/StartupStatus/startupstatus.cpp index ab82c229db..2a72f80300 100644 --- a/plugins/StatusManager/src/StartupStatus/startupstatus.cpp +++ b/plugins/StatusManager/src/StartupStatus/startupstatus.cpp @@ -215,7 +215,7 @@ static void CALLBACK SetStatusTimed(HWND, UINT, UINT_PTR, DWORD) if (it->ssDisabled) it->m_status = ID_STATUS_DISABLED; - CallService(MS_CS_SETSTATUSEX, (WPARAM)ps.getArray(), 0); + CallService(MS_CS_SETSTATUSEX, (WPARAM)&ps, 0); } static int OnOkToExit(WPARAM, LPARAM) |