2002/08/16 23:37:17

[org.ibex.core.git] / src / org / xwt / Main.java

diff --git a/src/org/xwt/Main.java b/src/org/xwt/Main.java
index d22e436..1cf9035 100644 (file)
--- a/src/org/xwt/Main.java
+++ b/src/org/xwt/Main.java
@@ -77,7 +77,9 @@ public class Main extends Applet {
             PNG png = PNG.decode(new ByteArrayInputStream(Base64.decode(scarPicture_png_base64)), "bundled scar image");
             Surface.scarPicture = Platform.createPicture(png.getData(), png.getWidth(), png.getHeight());
 
-            Resources.loadArchive(Main.class.getClassLoader().getResourceAsStream("org/xwt/builtin.xwar"));
+            InputStream is = Main.class.getClassLoader().getResourceAsStream("org/xwt/builtin.xwar");
+            if (is == null) Platform.criticalAbort("unable to load builtin.xwar");
+            Resources.loadArchive(is);
            
             String initialTemplate = "main";
 
@@ -98,6 +100,7 @@ public class Main extends Applet {
                     origin = "file:" + f.getAbsolutePath();
                     if (f.isDirectory()) {
                         Resources.loadDirectory(f);
+                        Surface.scarAllSurfacesFromNowOn = true;
                     } else {
                         initialTemplate = "org.xwt.builtin.splash";
                     }