summaryrefslogtreecommitdiff
path: root/plugins/Weather/src
diff options
context:
space:
mode:
authorGeorge Hazan <george.hazan@gmail.com>2012-11-29 13:55:06 +0000
committerGeorge Hazan <george.hazan@gmail.com>2012-11-29 13:55:06 +0000
commit5d5e4961ad8360b33dc8b363eae8e94c85b4c5cf (patch)
treeee2901fdb02241808d7d6f572780e09f62c6e8a8 /plugins/Weather/src
parented46b439633352ee3828c26abddc31f0f34ad794 (diff)
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
Diffstat (limited to 'plugins/Weather/src')
-rw-r--r--plugins/Weather/src/weather_update.cpp12
1 files changed, 6 insertions, 6 deletions
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);
+}