Snapshot idea/138.1980 from git://git.jetbrains.org/idea/community.git

Change-Id: Ib567c9c152d770212a7a3db20fbf591c210920bd

1 files changed, 4 insertions, 4 deletions

diff --git a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
index 75cb4de7af74..741f67dee2c4 100644
--- a/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
+++ b/platform/platform-api/src/com/intellij/openapi/ui/DialogWrapper.java
@@ -1233,6 +1233,7 @@ public abstract class DialogWrapper {
     if (SystemInfo.isWindows) {
       installEnterHook(root);
     }
+    myErrorTextAlarm.setActivationComponent(root);
   }
 
   @NotNull
@@ -1838,15 +1839,14 @@ public abstract class DialogWrapper {
       return;
     }
     myLastErrorText = text;
-    if (myActualSize == null && !StringUtil.isEmpty(text)) {
-      myActualSize = getSize();
-    }
-
     myErrorTextAlarm.cancelAllRequests();
     myErrorTextAlarm.addRequest(new Runnable() {
       @Override
       public void run() {
         final String text = myLastErrorText;
+        if (myActualSize == null && !StringUtil.isEmpty(text)) {
+          myActualSize = getSize();
+        }
         myErrorText.setError(text);
         if (text != null && text.length() > myMaxErrorTextLength) {
           // during the first update, resize only for growing. during a subsequent update,