From 293f22b8896100ed8d438b178b8a53df717d1f69 Mon Sep 17 00:00:00 2001 From: Diego Waxemberg Date: Thu, 5 Dec 2013 21:35:22 -0500 Subject: [PATCH] now only fixes menu stuff on osx so it doesn't break on other oses --- limelight-pc/src/com/limelight/Limelight.java | 32 ++++++++++--------- 1 file changed, 17 insertions(+), 15 deletions(-) diff --git a/limelight-pc/src/com/limelight/Limelight.java b/limelight-pc/src/com/limelight/Limelight.java index 9591123..9926087 100644 --- a/limelight-pc/src/com/limelight/Limelight.java +++ b/limelight-pc/src/com/limelight/Limelight.java @@ -17,7 +17,7 @@ import com.limelight.nvstream.av.video.VideoDecoderRenderer; public class Limelight implements NvConnectionListener { public static final double VERSION = 1.0; - + private String host; private StreamFrame streamFrame; private NvConnection conn; @@ -42,22 +42,24 @@ public class Limelight implements NvConnectionListener { } public static void main(String args[]) { - // take the menu bar off the jframe - System.setProperty("apple.laf.useScreenMenuBar", "true"); + //fix the menu bar if we are running in osx + if (System.getProperty("os.name").contains("Mac OS X")) { + // take the menu bar off the jframe + System.setProperty("apple.laf.useScreenMenuBar", "true"); - // set the name of the application menu item - System.setProperty("com.apple.mrj.application.apple.menu.about.name", "Limelight"); + // set the name of the application menu item + System.setProperty("com.apple.mrj.application.apple.menu.about.name", "Limelight"); + + // set the look and feel + try { + UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); + } catch (Exception e) { + System.out.println("OH Shit..."); + e.printStackTrace(); + System.exit(1); + } + } - // set the look and feel - try { - UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName()); - } catch (Exception e) { - System.out.println("OH Shit..."); - e.printStackTrace(); - System.exit(1); - } - - MainFrame limeFrame = new MainFrame(); limeFrame.build(); }