Procházet zdrojové kódy

Fix broken comparison

Change-Id: I70df54739f67e5a7cfc2336dbc606723384aa930
Reviewed-on: http://gerrit.dmdirc.com/3946
Reviewed-by: Greg Holmes <greg@dmdirc.com>
Automatic-Compile: DMDirc Build Manager
changes/46/3946/2
Chris Smith před 9 roky
rodič
revize
a519bf92a3

+ 2
- 2
ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/FrameContainerMenu.java Zobrazit soubor

@@ -87,7 +87,7 @@ public class FrameContainerMenu extends JMenu implements ActionListener, Selecti
87 87
 
88 88
             @Override
89 89
             public void run() {
90
-                if ((frame != null && window != null) && frame.equals(window)) {
90
+                if (frame != null && window != null && frame.equals(window.getContainer())) {
91 91
                     setIcon(window.getIconManager().getIcon(event.getIcon()));
92 92
                 }
93 93
             }
@@ -100,7 +100,7 @@ public class FrameContainerMenu extends JMenu implements ActionListener, Selecti
100 100
 
101 101
             @Override
102 102
             public void run() {
103
-                if ((frame != null && window != null) && frame.equals(window)) {
103
+                if (frame != null && window != null && frame.equals(window.getContainer())) {
104 104
                     setText(event.getName());
105 105
                 }
106 106
             }

+ 2
- 2
ui_swing/src/com/dmdirc/addons/ui_swing/framemanager/windowmenu/FrameContainerMenuItem.java Zobrazit soubor

@@ -87,7 +87,7 @@ public class FrameContainerMenuItem extends JMenuItem implements ActionListener,
87 87
 
88 88
             @Override
89 89
             public void run() {
90
-                if (frame != null && window != null && frame.equals(window)) {
90
+                if (frame != null && window != null && frame.equals(window.getContainer())) {
91 91
                     setIcon(window.getIconManager().getIcon(event.getIcon()));
92 92
                 }
93 93
             }
@@ -100,7 +100,7 @@ public class FrameContainerMenuItem extends JMenuItem implements ActionListener,
100 100
 
101 101
             @Override
102 102
             public void run() {
103
-                if (frame != null && window != null && frame.equals(window)) {
103
+                if (frame != null && window != null && frame.equals(window.getContainer())) {
104 104
                     setText(Styliser.stipControlCodes(event.getName()));
105 105
                 }
106 106
             }

Načítá se…
Zrušit
Uložit