From 897ffb2ab53d3b75434ac4a219c23772c4e3fdf8 Mon Sep 17 00:00:00 2001
From: Dmitry Batrak <Dmitry.Batrak@jetbrains.com>
Date: Mon, 5 Oct 2015 20:07:35 +0300
Subject: [PATCH] EA-73557, IDEA-145972 Cyclic dependency exception in
 RemoteDesktopDetector class

---
 .../com/intellij/ide/RemoteDesktopDetector.java | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/RemoteDesktopDetector.java b/platform/platform-impl/src/com/intellij/ide/RemoteDesktopDetector.java
index 7dbbe31db6f8..cf45db4d1455 100644
--- a/platform/platform-impl/src/com/intellij/ide/RemoteDesktopDetector.java
+++ b/platform/platform-impl/src/com/intellij/ide/RemoteDesktopDetector.java
@@ -19,6 +19,7 @@ import com.intellij.notification.Notification;
 import com.intellij.notification.NotificationType;
 import com.intellij.notification.Notifications;
 import com.intellij.openapi.application.ApplicationBundle;
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.ServiceManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.SystemInfo;
@@ -56,11 +57,17 @@ public class RemoteDesktopDetector {
         if (newValue != myRemoteDesktopConnected) {
           myRemoteDesktopConnected = newValue;
           if (myRemoteDesktopConnected) {
-            Notifications.Bus.notify(new Notification(Notifications.SYSTEM_MESSAGES_GROUP_ID,
-                                                      ApplicationBundle.message("remote.desktop.detected.title"),
-                                                      ApplicationBundle
-                                                        .message("remote.desktop.detected.message"),
-                                                      NotificationType.INFORMATION));
+            // We postpone notification to avoid recursive initialization of RemoteDesktopDetector 
+            // (in case it's initialized by request from com.intellij.notification.EventLog)
+            ApplicationManager.getApplication().invokeLater(new Runnable() {
+              public void run() {
+                Notifications.Bus.notify(new Notification(Notifications.SYSTEM_MESSAGES_GROUP_ID,
+                                                          ApplicationBundle.message("remote.desktop.detected.title"),
+                                                          ApplicationBundle
+                                                            .message("remote.desktop.detected.message"),
+                                                          NotificationType.INFORMATION));
+              }
+            });
           }
         }
       }