projects
/
idea
/
community.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
26706b5
)
Alarm: don't query current modality state outside EDT (IDEA-163378 JVM Memory View...
author
peter
<peter@jetbrains.com>
Mon, 31 Oct 2016 17:48:39 +0000
(18:48 +0100)
committer
peter
<peter@jetbrains.com>
Mon, 31 Oct 2016 18:00:32 +0000
(19:00 +0100)
platform/platform-api/src/com/intellij/util/Alarm.java
patch
|
blob
|
history
diff --git
a/platform/platform-api/src/com/intellij/util/Alarm.java
b/platform/platform-api/src/com/intellij/util/Alarm.java
index 9dda97dd7deb481fedcc5aae04b338d18c16eebd..5f177c20aca66bea3d6e57f2ebf07f8061366d93 100644
(file)
--- a/
platform/platform-api/src/com/intellij/util/Alarm.java
+++ b/
platform/platform-api/src/com/intellij/util/Alarm.java
@@
-172,7
+172,7
@@
public class Alarm implements Disposable {
if (myThreadToUse != ThreadToUse.SWING_THREAD) return null;
Application application = ApplicationManager.getApplication();
if (application == null) return null;
- return application.get
Curren
tModalityState();
+ return application.get
Defaul
tModalityState();
}
public void addRequest(@NotNull Runnable request, long delayMillis) {