From 5d5e4961ad8360b33dc8b363eae8e94c85b4c5cf Mon Sep 17 00:00:00 2001 From: George Hazan Date: Thu, 29 Nov 2012 13:55:06 +0000 Subject: automatic update should work in the silent mode only git-svn-id: http://svn.miranda-ng.org/main/trunk@2560 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/Weather/src/weather_update.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'plugins/Weather/src') diff --git a/plugins/Weather/src/weather_update.cpp b/plugins/Weather/src/weather_update.cpp index aa60678ccd..a4186be1c6 100644 --- a/plugins/Weather/src/weather_update.cpp +++ b/plugins/Weather/src/weather_update.cpp @@ -605,10 +605,10 @@ void CALLBACK timerProc2(HWND hwnd, UINT uMsg, UINT_PTR idEvent, DWORD dwTime) KillTimer(NULL, timerId); ThreadRunning = FALSE; - if ( !Miranda_Terminated()) { - if (opt.StartupUpdate) - UpdateAll(FALSE, FALSE); - timerId = SetTimer(NULL, 0, ((int)opt.UpdateTime)*60000, (TIMERPROC)timerProc); - } -} + if ( Miranda_Terminated()) + return; + if (opt.StartupUpdate && opt.NoProtoCondition) + UpdateAll(FALSE, FALSE); + timerId = SetTimer(NULL, 0, ((int)opt.UpdateTime)*60000, (TIMERPROC)timerProc); +} -- cgit v1.2.3