From 9891dc6c4012eac153ff0723023758e8f22d2f2d Mon Sep 17 00:00:00 2001 From: "Vladimir.Orlov" Date: Fri, 24 Oct 2014 18:32:49 +0400 Subject: [PATCH] fixed mac launcher - show update dialog few times. --- build/conf/mac/Contents/MacOS/idea | Bin 107644 -> 107644 bytes native/MacLauncher/Launcher.m | 4 +++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/build/conf/mac/Contents/MacOS/idea b/build/conf/mac/Contents/MacOS/idea index 837f29c3094796d595e9762acff2dc8aa6125c9f..dde4ca2a5bc7d806081cdb9c1d8581f5cdca9f6e 100755 GIT binary patch delta 4233 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 Dg$9|j diff --git a/native/MacLauncher/Launcher.m b/native/MacLauncher/Launcher.m index 9de15de97ada..e5083a4cf98a 100644 --- a/native/MacLauncher/Launcher.m +++ b/native/MacLauncher/Launcher.m @@ -208,7 +208,9 @@ NSString *requiredJvmVersion() { } BOOL satisfies(NSString *vmVersion, NSString *requiredVersion) { - javaUpdateRequired = isJavaUpdateRequired(vmVersion, requiredVersion); + if (!javaUpdateRequired){ + javaUpdateRequired = isJavaUpdateRequired(vmVersion, requiredVersion); + } if (javaUpdateRequired){ return !javaUpdateRequired; }