From 74bcfb3df0b2406e8e79fb6bf401583820fb492b Mon Sep 17 00:00:00 2001
From: Kirill Likhodedov <Kirill.Likhodedov@gmail.com>
Date: Wed, 12 Jun 2019 13:04:48 +0100
Subject: [PATCH] git: use correct component to calculate the modality state

The mainPanel is not added to the component hierarchy at this point.

GitOrigin-RevId: ffe3ab119a8eb711cee4890c9accd1d43f963cb4
---
 .../git4idea/src/git4idea/branch/ShowDiffWithBranchDialog.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/git4idea/src/git4idea/branch/ShowDiffWithBranchDialog.kt b/plugins/git4idea/src/git4idea/branch/ShowDiffWithBranchDialog.kt
index eebff9d8d9f7..d9b836fb3970 100644
--- a/plugins/git4idea/src/git4idea/branch/ShowDiffWithBranchDialog.kt
+++ b/plugins/git4idea/src/git4idea/branch/ShowDiffWithBranchDialog.kt
@@ -44,7 +44,7 @@ internal class ShowDiffWithBranchDialog(val project: Project,
     }
     mainPanel.setEmptyText("")
 
-    val modalityState = ModalityState.stateForComponent(mainPanel)
+    val modalityState = ModalityState.stateForComponent(rootPane)
     ApplicationManager.getApplication().executeOnPooledThread {
       val result = loadDiff()