From e2da192845dcc62c7cd2e8aa5ca44e7a54bb536e Mon Sep 17 00:00:00 2001
From: Anton Keks <anton@azib.net>
Date: Thu, 8 Dec 2016 00:34:13 +0200
Subject: [PATCH] Java's getDesktop() crashes if GTK3 is already loaded by SWT
 (apparently, it tries to load GTK2) - use SWT own API instead that works in
 both cases

---
 TODO.md                                              | 1 -
 src/net/azib/ipscan/gui/actions/BrowserLauncher.java | 6 ++----
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/TODO.md b/TODO.md
index a3643844..ac9743e9 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,6 +1,5 @@
 HiDPI:
 * New flat and retina-compatible icons :-)
-* GTK3 crashes URL opening with Desktop.getDesktop()
 * GTK3 startup is slow
 * GTK3 progress bar - can it be centered?
 * Fewer problems when starting with SWT_GTK3=0
diff --git a/src/net/azib/ipscan/gui/actions/BrowserLauncher.java b/src/net/azib/ipscan/gui/actions/BrowserLauncher.java
index f8b433ef..74234d8e 100644
--- a/src/net/azib/ipscan/gui/actions/BrowserLauncher.java
+++ b/src/net/azib/ipscan/gui/actions/BrowserLauncher.java
@@ -6,9 +6,7 @@
 package net.azib.ipscan.gui.actions;
 
 import net.azib.ipscan.core.UserErrorException;
-
-import java.awt.*;
-import java.net.URI;
+import org.eclipse.swt.program.Program;
 
 /**
  * The cross-platform browser launcher
@@ -23,7 +21,7 @@ public class BrowserLauncher {
 	 */
 	public static void openURL(String url) {
 		try {
-      		Desktop.getDesktop().browse(new URI(url));
+			Program.launch(url);
 		}
 		catch (Exception e) {
 			throw new UserErrorException("openURL.failed", url);