diff --git a/platform/platform-impl/src/com/intellij/ui/AppIcon.java b/platform/platform-impl/src/com/intellij/ui/AppIcon.java index a50b7104f129..89cbebb71bab 100644 --- a/platform/platform-impl/src/com/intellij/ui/AppIcon.java +++ b/platform/platform-impl/src/com/intellij/ui/AppIcon.java @@ -2,6 +2,7 @@ package com.intellij.ui; import com.intellij.icons.AllIcons; +import com.intellij.jna.JnaLoader; import com.intellij.openapi.application.Application; import com.intellij.openapi.application.ApplicationActivationListener; import com.intellij.openapi.application.ApplicationManager; @@ -45,7 +46,7 @@ public abstract class AppIcon { if (SystemInfo.isMac) { ourIcon = new MacAppIcon(); } - else if (SystemInfo.isWin7OrNewer) { + else if (SystemInfo.isWin7OrNewer && JnaLoader.isLoaded()) { ourIcon = new Win7AppIcon(); } else { diff --git a/platform/platform-impl/src/com/intellij/ui/Win7TaskBar.java b/platform/platform-impl/src/com/intellij/ui/Win7TaskBar.java index 531c1ff99f61..2f01d398dfc2 100644 --- a/platform/platform-impl/src/com/intellij/ui/Win7TaskBar.java +++ b/platform/platform-impl/src/com/intellij/ui/Win7TaskBar.java @@ -1,7 +1,6 @@ // Copyright 2000-2019 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.ui; -import com.intellij.jna.JnaLoader; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.diagnostic.Logger; import com.intellij.openapi.wm.IdeFrame; @@ -74,7 +73,7 @@ class Win7TaskBar { } private static boolean initialize() { - if (ApplicationManager.getApplication().isUnitTestMode() || !JnaLoader.isLoaded()) { + if (ApplicationManager.getApplication().isUnitTestMode()) { return false; }