diff options
| author | George Hazan <ghazan@miranda.im> | 2018-05-11 21:22:17 +0200 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2018-05-11 21:22:17 +0200 |
| commit | 3f1628f127d35aa14da97e50c2a94cfd61ad52dd (patch) | |
| tree | e9f1d8a1282e3c5ee0139003f4aac0e932a99213 /plugins/StatusManager/src/StartupStatus | |
| parent | 6a6f2b9e3b2749f16b513dfc98d5d5038b5628fb (diff) | |
merge from master to
fixes #1349 (Miranda crashes on coming back from auto away)
Diffstat (limited to 'plugins/StatusManager/src/StartupStatus')
| -rw-r--r-- | plugins/StatusManager/src/StartupStatus/ss_profiles.cpp | 2 | ||||
| -rw-r--r-- | plugins/StatusManager/src/StartupStatus/startupstatus.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/StatusManager/src/StartupStatus/ss_profiles.cpp b/plugins/StatusManager/src/StartupStatus/ss_profiles.cpp index 2aba9ad8d8..46db3d1299 100644 --- a/plugins/StatusManager/src/StartupStatus/ss_profiles.cpp +++ b/plugins/StatusManager/src/StartupStatus/ss_profiles.cpp @@ -204,7 +204,7 @@ INT_PTR LoadAndSetProfile(WPARAM iProfileNo, LPARAM) char setting[64]; mir_snprintf(setting, "%d_%s", profile, SETTING_SHOWCONFIRMDIALOG); if (!db_get_b(0, SSMODULENAME, setting, 0)) - CallService(MS_CS_SETSTATUSEX, (WPARAM)&ps, 0); + SetStatusEx(ps); else ShowConfirmDialogEx(&ps, db_get_dw(0, SSMODULENAME, SETTING_DLGTIMEOUT, 5)); } diff --git a/plugins/StatusManager/src/StartupStatus/startupstatus.cpp b/plugins/StatusManager/src/StartupStatus/startupstatus.cpp index 6eb6bb820a..a4e67e1b31 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, 0); + SetStatusEx(ps); } static int OnOkToExit(WPARAM, LPARAM) |