diff options
| author | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-11-02 17:46:01 +0000 |
|---|---|---|
| committer | Vadim Dashevskiy <watcherhd@gmail.com> | 2013-11-02 17:46:01 +0000 |
| commit | 1b4e13e9c4b9126e97fa457a86515db11557fa9b (patch) | |
| tree | c3c2820fd053fa8c8f123e822eead96a4363fd14 | |
| parent | b00c26145dbf35830e85590e8442ec910a9a9b56 (diff) | |
StartupSilence: one more fix (by person)
git-svn-id: http://svn.miranda-ng.org/main/trunk@6746 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
| -rw-r--r-- | plugins/StartupSilence/src/main.cpp | 30 |
1 files changed, 16 insertions, 14 deletions
diff --git a/plugins/StartupSilence/src/main.cpp b/plugins/StartupSilence/src/main.cpp index 1bd2e66885..47def43106 100644 --- a/plugins/StartupSilence/src/main.cpp +++ b/plugins/StartupSilence/src/main.cpp @@ -132,22 +132,24 @@ int DisablePopup(WPARAM wParam, LPARAM lParam) if (DefEnabled == 1 && DefPopup == 0) //All popups are blocked
return 1;
- if ((timer == 2 && NonStatusAllow == 1) //filtering while timer
- || (DefPopup == 1 && DefEnabled == 1)) //also filtered only: We do not run next lines every time
- //if "Filtered only..." is unchecked --->
- {
- HANDLE hContact = (HANDLE)wParam;
- if (hContact != NULL)
+ if ( (NonStatusAllow == 1) // while startup allow popups for unread mail notification from MRA, keepstatus ... other services?
+ || ((DefPopup == 1 && DefEnabled == 1) && timer !=2) ) //also filtered only: We do not run next lines every time
+ //if "Filtered only..." is unchecked --->
{
- char* cp = GetContactProto(hContact);
- if ( !strcmp(cp, "Weather") || !strcmp(cp, "mRadio") )
- return 0;
+ HANDLE hContact = (HANDLE)wParam;
+ if (hContact != NULL)
+ {
+ char* cp = GetContactProto(hContact);
+ if ( !strcmp(cp, "Weather") || !strcmp(cp, "mRadio") )
+ return 0;
+ return 1;
+ }
+ else return 0;
}
- else return 0; //allow popups for unread mail notification from MRA, keepstatus ... other services?
-
- return 1; //filtering while timer
- }
- return 0; //---> just allow all popups with this return
+ else if (timer == 2)
+ return 1; //block all popups at startup
+ return 0; //---> just allow all popups with this return
+ //or allow popups for unread mail notification from MRA, keepstatus ... other services?
}
void EnablePopupModule()
|