--- a/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Mon Nov 16 19:05:19 2015 +0900
+++ b/src/viewer_swing/java/com/glavsoft/viewer/swing/SwingViewerWindow.java	Tue Nov 17 14:02:59 2015 +0900
@@ -851,16 +851,16 @@
             @Override
             public void actionPerformed(ActionEvent e) {
                 ArrayList<Rectangle> rectangles = viewer.getScreenRectangles();
-                ScreenChangeSelectionPanel selectionPanel = new ScreenChangeSelectionPanel(viewerWindow, context);
-                if (rectangles.size() == 1) { // single Display
-                    selectionPanel.checkBox("single screen");
-                } else if (rectangles.size() == 2){
+                if (rectangles.size() == 1) { // single display
+                    screenChangeRequest(context, 0);
+                } else if (rectangles.size() == 2){ // dual display
+                    ScreenChangeSelectionPanel selectionPanel = new ScreenChangeSelectionPanel(viewerWindow, context);
                     selectionPanel.checkBox("all screen");
                     selectionPanel.checkBox("left screen");
                     selectionPanel.checkBox("right screen");
+                    selectionPanel.setButton();
+                    selectionPanel.visible();
                 }
-                selectionPanel.setButton();
-                selectionPanel.visible();
             }
         });
 
@@ -919,7 +919,7 @@
         viewer.getRfb().setSingleDisplaySize(singleWidth, singleHeight);
         if (viewer.getRfb().hasParent()) {
             String adr = viewer.getRfb().getMyAddress();
-                if (portScan(adr, ConnectionParams.DEFAULT_RFB_PORT)) {
+                if (scanPort(adr, ConnectionParams.DEFAULT_RFB_PORT)) {
                     // -1 means request to reverse direct connection socket
                     short id = viewer.getRfb().isTreeManager()? (short)-1 : viewer.getRfb().getId();
                     context.sendMessage(new ScreenChangeRequest(adr, ConnectionParams.DEFAULT_VNC_ROOT, id, singleWidth, singleHeight, shareScreenNumber));
@@ -932,7 +932,7 @@
         }
     }
 
-    private boolean portScan(String adr, int port) {
+    private boolean scanPort(String adr, int port) {
         try {
             Socket socket = new Socket(adr, port);
             socket.close();