Merge pull request #3106 from SRLJustin/mac_crash

project: made MacOSQuitStrategy java11 compatable
This commit is contained in:
Justin
2022-01-05 05:03:43 +11:00
committed by GitHub

View File

@@ -24,25 +24,14 @@
*/ */
package net.runelite.client.ui; package net.runelite.client.ui;
import com.apple.eawt.Application; import java.awt.Desktop;
import com.apple.eawt.QuitStrategy; import java.awt.desktop.QuitStrategy;
class MacOSQuitStrategy class MacOSQuitStrategy
{ {
public static void setup() public static void setup()
{ {
try Desktop.getDesktop()
{
// com.apple.eawt.QuitStrategy was moved to java.desktop in Java 9,
// but our OrangeExtensions API targets 1.6, so this code is only valid
// on 8 below.
Application.getApplication()
.setQuitStrategy(QuitStrategy.CLOSE_ALL_WINDOWS); .setQuitStrategy(QuitStrategy.CLOSE_ALL_WINDOWS);
}
catch (NoClassDefFoundError ex)
{
// IntelliJ doesn't handle our multi-release Maven setup well, and will run
// this class on 11+. Ignore the error so the client can launch.
}
} }
} }