Merge branch 'bug/JAL-2934proportionalScrolling' into develop

[jalview.git] / src / jalview / gui / UserDefinedColours.java

diff --git a/src/jalview/gui/UserDefinedColours.java b/src/jalview/gui/UserDefinedColours.java
index 4979746..14f9adf 100755 (executable)
--- a/src/jalview/gui/UserDefinedColours.java
+++ b/src/jalview/gui/UserDefinedColours.java
@@ -148,7 +148,7 @@ public class UserDefinedColours extends GUserDefinedColours
   {
     colorChooser.getSelectionModel().addChangeListener(this);
     frame = new JInternalFrame();
-    frame.setFrameIcon(WindowIcons.logoIcon);
+    frame.setFrameIcon(null);
     frame.setContentPane(this);
     Desktop.addInternalFrame(frame,
             MessageManager.getString("label.user_defined_colours"),
@@ -686,7 +686,6 @@ public class UserDefinedColours extends GUserDefinedColours
       }
 
       addNewColourScheme(choice.getPath());
-      return null;
     });
 
     chooser.showOpenDialog(this);