From f175a5e78a8767dd4c5817ade7e83543943933f8 Mon Sep 17 00:00:00 2001 From: Diego Waxemberg Date: Wed, 1 Jan 2014 11:02:36 -0500 Subject: [PATCH] Now close Limelight when the stream is stopped if launched from command line --- src/com/limelight/Limelight.java | 4 +++- src/com/limelight/gui/StreamFrame.java | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/com/limelight/Limelight.java b/src/com/limelight/Limelight.java index 5b03dde..86464a2 100644 --- a/src/com/limelight/Limelight.java +++ b/src/com/limelight/Limelight.java @@ -27,7 +27,8 @@ import com.limelight.settings.PreferencesManager.Preferences.Resolution; */ public class Limelight implements NvConnectionListener { public static final double VERSION = 1.0; - + public static boolean COMMAND_LINE_LAUNCH = false; + private String host; private StreamFrame streamFrame; private NvConnection conn; @@ -189,6 +190,7 @@ public class Limelight implements NvConnectionListener { Limelight limelight = new Limelight(host); limelight.startUp(streamConfig, fullscreen); + COMMAND_LINE_LAUNCH = true; } diff --git a/src/com/limelight/gui/StreamFrame.java b/src/com/limelight/gui/StreamFrame.java index 3c6d178..cc6eae2 100644 --- a/src/com/limelight/gui/StreamFrame.java +++ b/src/com/limelight/gui/StreamFrame.java @@ -280,5 +280,8 @@ public class StreamFrame extends JFrame { public void close() { limelight.stop(); dispose(); + if (Limelight.COMMAND_LINE_LAUNCH) { + System.exit(0); + } } }