diff options
| author | George Hazan <ghazan@miranda.im> | 2016-12-02 23:55:15 +0300 |
|---|---|---|
| committer | George Hazan <ghazan@miranda.im> | 2016-12-02 23:55:15 +0300 |
| commit | 4882bc420186a4aef19be699e3f621dec932417d (patch) | |
| tree | 4bd45d158a1a1470d590edbbb71098721d650333 /plugins/Clist_modern | |
| parent | 10091bbca1380a1d8e3b9d61b8c175490036af5b (diff) | |
MS_SYSTEM_* services became functions
Diffstat (limited to 'plugins/Clist_modern')
| -rw-r--r-- | plugins/Clist_modern/src/modern_clistmenus.cpp | 10 | ||||
| -rw-r--r-- | plugins/Clist_modern/src/modern_clui.cpp | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp index 7d97a9d428..7cee0bee47 100644 --- a/plugins/Clist_modern/src/modern_clistmenus.cpp +++ b/plugins/Clist_modern/src/modern_clistmenus.cpp @@ -30,11 +30,13 @@ int LoadFavoriteContactMenu(); INT_PTR CloseAction(WPARAM, LPARAM)
{
- int k;
g_CluiData.bSTATE = STATE_PREPARETOEXIT; // workaround for avatar service and other wich destroys service on OK_TOEXIT
- do
- k = CallService(MS_SYSTEM_OKTOEXIT, 0, 0);
- while (!k);
+
+ bool k;
+ do {
+ k = Miranda_OkToExit();
+ }
+ while (!k);
if (k)
DestroyWindow(pcli->hwndContactList);
diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index 6c0e1af226..d42f7c6455 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -538,7 +538,7 @@ static BOOL CLUI_WaitThreadsCompletion() static const BYTE bcMAX_AWAITING_RETRY = 10; // repeat awaiting only 10 times
TRACE("CLUI_WaitThreadsCompletion Enter");
if (bEntersCount < bcMAX_AWAITING_RETRY &&
- (g_CluiData.mutexPaintLock || g_hAwayMsgThread || g_hGetTextAsyncThread || g_hSmoothAnimationThread) && !Miranda_Terminated())
+ (g_CluiData.mutexPaintLock || g_hAwayMsgThread || g_hGetTextAsyncThread || g_hSmoothAnimationThread) && !Miranda_IsTerminated())
{
TRACE("Waiting threads");
TRACEVAR("g_CluiData.mutexPaintLock: %x", g_CluiData.mutexPaintLock);
|