|
@@ -50,7 +50,7 @@ public final class ColourManager {
|
50
|
50
|
};
|
51
|
51
|
|
52
|
52
|
/** Actual colours we're using for the 16 IRC colours. */
|
53
|
|
- private static Color[] IRC_COLOURS = DEFAULT_COLOURS;
|
|
53
|
+ private static Color[] IRC_COLOURS = DEFAULT_COLOURS.clone();
|
54
|
54
|
|
55
|
55
|
/** Creates a new instance of ColourManager. */
|
56
|
56
|
private ColourManager() {
|
|
@@ -59,15 +59,16 @@ public final class ColourManager {
|
59
|
59
|
/**
|
60
|
60
|
* Initialises the IRC_COLOURS array.
|
61
|
61
|
*/
|
62
|
|
- private static void initColours() {
|
63
|
|
- IRC_COLOURS = DEFAULT_COLOURS;
|
64
|
|
-
|
|
62
|
+ private static void initColours() {
|
65
|
63
|
for (int i = 0; i < 16; i++) {
|
66
|
64
|
if (IdentityManager.getGlobalConfig().hasOption("colour", String.valueOf(i))) {
|
67
|
65
|
IRC_COLOURS[i] = getColour(IdentityManager.getGlobalConfig()
|
68
|
66
|
.getOption("colour", String.valueOf(i)));
|
69
|
|
- }
|
70
|
|
- COLOUR_CACHE.remove(String.valueOf(i));
|
|
67
|
+ COLOUR_CACHE.remove(String.valueOf(i));
|
|
68
|
+ } else if (!IRC_COLOURS[i].equals(DEFAULT_COLOURS[i])) {
|
|
69
|
+ IRC_COLOURS[i] = DEFAULT_COLOURS[i];
|
|
70
|
+ COLOUR_CACHE.remove(String.valueOf(i));
|
|
71
|
+ }
|
71
|
72
|
}
|
72
|
73
|
}
|
73
|
74
|
|