Browse Source

Fixes issue 3642: Invalid URLs for background images causes an exception

Change-Id: I080acad5cc07e7b1a6dd98f56e3b5d4ee3f45882
Reviewed-on: http://gerrit.dmdirc.com/659
Reviewed-by: Shane Mc Cormack <shane@dmdirc.com>
Automatic-Compile: Gregory Holmes <greg@dmdirc.com>
tags/0.6.3
Gregory Holmes 14 years ago
parent
commit
b61555c8c6

+ 5
- 2
src/com/dmdirc/addons/ui_swing/components/desktopPane/DMDircDesktopPane.java View File

@@ -49,6 +49,7 @@ import java.awt.Image;
49 49
 import java.beans.PropertyChangeEvent;
50 50
 import java.beans.PropertyChangeListener;
51 51
 import java.io.IOException;
52
+import java.net.URL;
52 53
 import java.util.Arrays;
53 54
 import java.util.HashMap;
54 55
 import java.util.Map;
@@ -398,8 +399,10 @@ public class DMDircDesktopPane extends JDesktopPane implements FrameListener,
398 399
             @Override
399 400
             public void run() {
400 401
                 try {
401
-                    backgroundImage = ImageIO.read(URLBuilder.buildURL(
402
-                            backgroundPath));
402
+                    final URL url = URLBuilder.buildURL(backgroundPath);
403
+                    if (url != null) {
404
+                        backgroundImage = ImageIO.read(url);
405
+                    }
403 406
                 } catch (IOException ex) {
404 407
                     backgroundImage = null;
405 408
                 }

+ 5
- 2
src/com/dmdirc/addons/ui_swing/textpane/TextPaneCanvas.java View File

@@ -49,6 +49,7 @@ import java.awt.font.TextHitInfo;
49 49
 import java.awt.font.TextLayout;
50 50
 import java.awt.image.BufferedImage;
51 51
 import java.io.IOException;
52
+import java.net.URL;
52 53
 import java.text.AttributedCharacterIterator;
53 54
 import java.text.AttributedString;
54 55
 import java.util.HashMap;
@@ -173,8 +174,10 @@ class TextPaneCanvas extends JPanel implements MouseInputListener,
173 174
             @Override
174 175
             public void run() {
175 176
                 try {
176
-                    backgroundImage = ImageIO.read(URLBuilder.
177
-                            buildURL(backgroundPath));
177
+                    final URL url = URLBuilder.buildURL(backgroundPath);
178
+                    if (url != null) {
179
+                        backgroundImage = ImageIO.read(url);
180
+                    }
178 181
                 } catch (IOException ex) {
179 182
                     backgroundImage = null;
180 183
                 }

Loading…
Cancel
Save