--- a/WorkspaceApplication.st	Sat May 02 09:58:09 2015 +0200
+++ b/WorkspaceApplication.st	Sat May 02 17:37:41 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2001 by eXept Software AG
               All Rights Reserved
@@ -1831,10 +1833,13 @@
 !
 
 openMyWorkspace
+    |ws|
+
     "/ openMyWorkspace_new leads to an error in root /, which we dont understand...
-    self openMyWorkspace_new.
+    ws := self openMyWorkspace_new.
     "/ self openMyWorkspace_old.
     MyWorkspaceOpened := true.
+    ^ ws
 
     "
       WorkspaceApplication openMyWorkspace
@@ -1881,6 +1886,7 @@
     ].
     workspace selectedWorkspaceIndexHolder value: 1.
     workspace openWindow.
+    ^ workspace
 
     "
      WorkspaceApplication openMyWorkspace
@@ -1894,7 +1900,7 @@
 openMyWorkspace_old
     "open showing the single file: MyWorkspace.wsp"
 
-    self openOnFile:'MyWorkspace.wsp'
+    ^ self openOnFile:'MyWorkspace.wsp'
 
     "
      self openMyWorkspace.
@@ -2035,9 +2041,9 @@
     "/ the very first open opens a MyWorkspace
 
     (MyWorkspaceOpened == true) ifTrue:[
-        super open
+        ^ self openRegularWorkspace
     ] ifFalse:[
-        self openMyWorkspace
+        ^ self openMyWorkspace
     ].
 
     "
@@ -2052,7 +2058,7 @@
 openRegularWorkspace
     "/ always open a normal MyWorkspace
 
-    super open
+    ^ super open
 
     "
      MyWorkspaceOpened := nil.
@@ -4585,14 +4591,14 @@
 !WorkspaceApplication class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.284 2015-02-24 15:45:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.285 2015-05-02 15:37:41 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.284 2015-02-24 15:45:11 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/WorkspaceApplication.st,v 1.285 2015-05-02 15:37:41 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: WorkspaceApplication.st,v 1.284 2015-02-24 15:45:11 cg Exp $'
+    ^ '$Id: WorkspaceApplication.st,v 1.285 2015-05-02 15:37:41 cg Exp $'
 ! !