From 4c6ec523b20908cb1179ea3280bb46e75ba9bc50 Mon Sep 17 00:00:00 2001 From: Vassiliy Date: Wed, 23 Apr 2014 23:02:57 +0400 Subject: [PATCH] Naive fix for EA-53569 --- .../intellij/notification/impl/NotificationsManagerImpl.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java b/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java index 3733d3faa646..1ef2f4c7cbb7 100644 --- a/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java +++ b/platform/platform-impl/src/com/intellij/notification/impl/NotificationsManagerImpl.java @@ -276,7 +276,9 @@ public class NotificationsManagerImpl extends NotificationsManager { final JPanel content = new NonOpaquePanel(new BorderLayout((int)(label.getIconTextGap() * 1.5), (int)(label.getIconTextGap() * 1.5))); - text.setCaretPosition(0); + if (text.getCaret() != null) { + text.setCaretPosition(0); + } JScrollPane pane = ScrollPaneFactory.createScrollPane(text, ScrollPaneConstants.VERTICAL_SCROLLBAR_AS_NEEDED, ScrollPaneConstants.HORIZONTAL_SCROLLBAR_AS_NEEDED);