Index: ui/WizardFolder.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/ui/WizardFolder.java,v
retrieving revision 1.12
diff -r1.12 WizardFolder.java
30a31
> import org.openide.util.Task;
124a126,160
>     }
> 
>     /** Ovverrides task creation policy to run tasks always in AWT thread, as
>      * wizards usually work with swing
>      */
>     protected Task postCreationTask (Runnable run) {
>         return new AWTTask(run);
>     }
>     
>     /** A special task designed to run in AWT thread.
>      * It will fire itself immediatelly.
>      * Copied from openide.awt.AWTTask
>      */
>     private static class AWTTask extends org.openide.util.Task {
>         private boolean executed;
> 
>         public AWTTask (Runnable r) {
>             super (r);
>             org.openide.util.Mutex.EVENT.readAccess (this);
>         }
> 
>         public void run () {
>             if (!executed) {
>                 super.run ();
>                 executed = true;
>             }
>         }
> 
>         public void waitFinished () {
>             if (javax.swing.SwingUtilities.isEventDispatchThread ()) {
>                 run ();
>             } else {
>                 super.waitFinished ();
>             }
>         }
Index: windows/WindowManagerImpl.java
===================================================================
RCS file: /cvs/core/src/org/netbeans/core/windows/WindowManagerImpl.java,v
retrieving revision 1.118.2.6
diff -r1.118.2.6 WindowManagerImpl.java
1271a1272,1276
>                 // don't reset anything if no worspaces are loaded (first start for example)
>                 if (wmi.getWorkspacesNoLoad().length == 0) {
>                     setProjectOpen (true);
>                     return;
>                 }