diff --git a/bbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar b/bbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar index 2c343c5bfdbe1a1d51eb85818ec72d4279ceae96..64db20b8b9f04722ed7202244b867cf9a0d68b9a 100755 Binary files a/bbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar and b/bbb-screenshare/app/jws/lib/javacv-screenshare-0.0.1.jar differ diff --git a/bbb-screenshare/jws/webstart/src/main/java/org/bigbluebutton/screenshare/client/ScreenRegionSharer.java b/bbb-screenshare/jws/webstart/src/main/java/org/bigbluebutton/screenshare/client/ScreenRegionSharer.java index 4f79b454bbcfdfed72784bb728c31ab0d0ab6066..9adc67e985f3eb543e7d712b9c58540113cd65cf 100755 --- a/bbb-screenshare/jws/webstart/src/main/java/org/bigbluebutton/screenshare/client/ScreenRegionSharer.java +++ b/bbb-screenshare/jws/webstart/src/main/java/org/bigbluebutton/screenshare/client/ScreenRegionSharer.java @@ -49,7 +49,7 @@ public class ScreenRegionSharer implements ScreenSharer, NetworkConnectionListen } public void start(boolean autoStart) { - if (status.toUpperCase().equals(STOP)) { + if (!status.toUpperCase().equals(START)) { CaptureRegionListener crl = new CaptureRegionListenerImp(this); frame = new CaptureRegionFrame(crl, 5); frame.setHeight(ssi.captureHeight); @@ -78,16 +78,18 @@ public class ScreenRegionSharer implements ScreenSharer, NetworkConnectionListen } public void stop() { - status = STOP; - frame.setVisible(false); - sharer.stopSharing(); - signalChannel.stopSharing(); - tray.removeIconFromSystemTray(); - System.out.println(NAME + "Closing Screen Capture Frame"); + if (! status.toUpperCase().equals(STOP)) { + status = STOP; + frame.setVisible(false); + sharer.stopSharing(); + signalChannel.stopSharing(); + tray.removeIconFromSystemTray(); + System.out.println(NAME + "Closing Screen Capture Frame"); + } } private void pause() { - if (status.toUpperCase().equals(PAUSE)) { + if (! status.toUpperCase().equals(PAUSE)) { frame.setVisible(false); sharer.stopSharing(); status = PAUSE; @@ -102,7 +104,7 @@ public class ScreenRegionSharer implements ScreenSharer, NetworkConnectionListen System.out.println(NAME + "Pausing. Reason=" + reason.getExitCode()); pause(); } else if (reason.getExitCode() == ExitCode.START.getExitCode()) { - System.out.println(NAME + "Pausing. Reason=" + reason.getExitCode()); + System.out.println(NAME + "starting. Reason=" + reason.getExitCode()); start(false); } else { System.out.println(NAME + "Closing. Reason=" + reason.getExitCode()); diff --git a/bigbluebutton-client/locale/en_US/bbbResources.properties b/bigbluebutton-client/locale/en_US/bbbResources.properties index 42e449542b1f1f56fda67e6e0b56d58a69b3fc98..ff7f257a538b13d1a4291d7fd126a86ce5deee3d 100755 --- a/bigbluebutton-client/locale/en_US/bbbResources.properties +++ b/bigbluebutton-client/locale/en_US/bbbResources.properties @@ -292,8 +292,10 @@ bbb.screensharePublish.fullscreen.tooltip = Share Your Main Screen bbb.screensharePublish.fullscreen.label = Full Screen bbb.screensharePublish.region.tooltip = Share a Part of Your Screen bbb.screensharePublish.region.label = Region -bbb.screensharePublish.stop.tooltip = Pause screen share -bbb.screensharePublish.stop.label = Pause +bbb.screensharePublish.pause.tooltip = Pause screen share +bbb.screensharePublish.pause.label = Pause +bbb.screensharePublish.restart.tooltip = Restart screen share +bbb.screensharePublish.restart.label = Restart bbb.screensharePublish.maximizeRestoreBtn.toolTip = You cannot maximize this window. bbb.screensharePublish.closeBtn.toolTip = Stop Sharing and Close bbb.screensharePublish.chromeOnMacUnsupportedHint = Desktop sharing is not currently supported on Chrome running under Mac OS X. Recommend you use FireFox to share desktop.