From 50569c807d878fef6fd7c46fb25da54d43c2a8c3 Mon Sep 17 00:00:00 2001
From: nik <Nikolay.Chashnikov@jetbrains.com>
Date: Wed, 23 Sep 2015 16:28:05 +0300
Subject: [PATCH] exception reporting: if non-default errorHandler extension is
 specified in plugin.xml it should be used even if the plugin vendor is
 JetBrains (so exceptions from Android plugin will be send to Google)

---
 .../src/com/intellij/diagnostic/IdeErrorsDialog.java         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java b/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java
index 2d44f94f51d7..84be6a3ee706 100644
--- a/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java
+++ b/platform/platform-impl/src/com/intellij/diagnostic/IdeErrorsDialog.java
@@ -1010,7 +1010,7 @@ public class IdeErrorsDialog extends DialogWrapper implements MessagePoolListene
       return null;
     }
     IdeaPluginDescriptor plugin = PluginManager.getPlugin(pluginId);
-    if (plugin == null || PluginManagerMain.isDevelopedByJetBrains(plugin)) {
+    if (plugin == null) {
       return getCorePluginSubmitter(reporters);
     }
     for (ErrorReportSubmitter reporter : reporters) {
@@ -1019,6 +1019,9 @@ public class IdeErrorsDialog extends DialogWrapper implements MessagePoolListene
         return reporter;
       }
     }
+    if (PluginManagerMain.isDevelopedByJetBrains(plugin)) {
+      return getCorePluginSubmitter(reporters);
+    }
     return null;
   }