fixes #3807 (Popup+: настройка YAMN "всегда показывать вспл.окна" имеет приоритет перед глушением окон в idle)

3 files changed, 6 insertions, 4 deletions

diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp
index 04ee826c2e..e1ba577864 100644
--- a/plugins/Popup/src/main.cpp
+++ b/plugins/Popup/src/main.cpp
@@ -237,6 +237,9 @@ static int ModulesLoaded(WPARAM, LPARAM)
 	LoadActions();

 	LoadNotifications();

 

+	// register idle mode switcher

+	HookEvent(ME_IDLE_CHANGED, OnIdleChanged);

+

 	// hook TopToolBar

 	HookEvent(ME_TTB_MODULELOADED, TTBLoaded);

 

diff --git a/plugins/Popup/src/services.cpp b/plugins/Popup/src/services.cpp
index 48a73fc864..32a9f4d4c7 100644
--- a/plugins/Popup/src/services.cpp
+++ b/plugins/Popup/src/services.cpp
@@ -475,7 +475,7 @@ static INT_PTR Popup_LoadSkin(WPARAM, LPARAM lParam)
 	return 1;

 }

 

-static int OnIdleChanged(WPARAM, LPARAM lParam)

+int OnIdleChanged(WPARAM, LPARAM lParam)

 {

 	g_bIdleMode = (lParam & IDF_ISIDLE) != 0;

 	return 0;

@@ -514,7 +514,4 @@ void CreateServices()
 	CreateServiceFunction(MS_POPUP_DESTROYPOPUP, Popup_DeletePopup);

 

 	CreateServiceFunction("Popup/LoadSkin", Popup_LoadSkin);

-

-	// register idle mode switcher

-	HookEvent(ME_IDLE_CHANGED, OnIdleChanged);

 }

diff --git a/plugins/Popup/src/stdafx.h b/plugins/Popup/src/stdafx.h
index 8d297fd0e0..6cfca9e544 100644
--- a/plugins/Popup/src/stdafx.h
+++ b/plugins/Popup/src/stdafx.h
@@ -139,4 +139,6 @@ INT_PTR svcEnableDisableMenuCommand(WPARAM, LPARAM);
 void InitIcons();

 void CreateServices();

 

+int OnIdleChanged(WPARAM, LPARAM lParam);

+

 #endif //HEADERS_H