--- a/TerminalApplication.st	Wed Nov 30 10:07:29 2011 +0100
+++ b/TerminalApplication.st	Wed Nov 30 11:06:32 2011 +0100
@@ -351,25 +351,29 @@
 createWorkspace
     |scr|
 
-    (OperatingSystem isUNIXlike and:[XTermView notNil]) ifTrue:[
-        scr := XTermView new
-    ] ifFalse:[
-    VT100TerminalView isNil ifTrue:[
-        self error:'missing: VT100TerminalView'
-    ].
+"/    JV@2011-11-30: XTermView disabled as recent changes in
+"/    #startShellInSelectedWindow leads to infinite loop.
+"/    further investigation needed.        
 
+"/    (OperatingSystem isUNIXlike and:[XTermView notNil]) ifTrue:[
+"/        scr := XTermView new.
+"/        scr workingDirectory: initialDirectory.
+"/    ] ifFalse:[
+        VT100TerminalView isNil ifTrue:[
+            self error:'missing: VT100TerminalView'
+        ].
         scr := (HVScrollableView for:VT100TerminalView).
         scr autoHideScrollBars:false.
         scr horizontalMini:true.
-    ].
+"/    ].
 
     self window realized ifTrue:[
         self window sensor pushUserEvent:#startShellInSelectedWindow for:self.
     ].
     ^ scr
 
-    "Modified: / 25-11-2010 / 12:45:26 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified: / 08-04-2011 / 14:56:57 / cg"
+    "Modified (format): / 30-11-2011 / 11:06:16 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
 doKill
@@ -472,5 +476,5 @@
 !TerminalApplication class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/TerminalApplication.st,v 1.10 2011-07-07 14:13:17 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/TerminalApplication.st,v 1.11 2011-11-30 10:06:32 vrany Exp $'
 ! !