--- a/FileBrowserV2.st	Sat Apr 27 15:01:21 2013 +0200
+++ b/FileBrowserV2.st	Sun Apr 28 15:34:16 2013 +0200
@@ -1452,34 +1452,34 @@
 !FileBrowserV2 methodsFor:'change & update'!
 
 currentFileNameHolderChanged
-    |newEntryValue nSelected files volume|
+    |newEntryValue nSelected files volume dir|
 
     files := self currentSelectedObjects.
     nSelected := files size.
 
     nSelected == 0 ifTrue:[
-	newEntryValue := ''.
+        newEntryValue := ''.
     ] ifFalse:[
-	nSelected == 1 ifTrue:[
-	    newEntryValue := files first.
-	] ifFalse:[
-	    newEntryValue := self commonPrefixOfSelectedFiles.
-	].
+        nSelected == 1 ifTrue:[
+            newEntryValue := files first.
+        ] ifFalse:[
+            newEntryValue := self commonPrefixOfSelectedFiles.
+        ].
     ].
     self fileEntryFieldHolder value:(newEntryValue asString) withoutNotifying:self.
 
     OperatingSystem supportsVolumes ifTrue:[
-	volume := (nSelected >= 1)
-		    ifTrue:[files first volume]
-		    ifFalse:[nil].
-	self selectedDeviceDrive value:volume.
+        volume := (nSelected >= 1)
+                    ifTrue:[files first volume]
+                    ifFalse:[nil].
+        self selectedDeviceDrive value:volume.
     ].
     self updatePreview.
 
     nSelected == 1 ifTrue:[
-	self currentDirectory notNil ifTrue:[
-	    self window label:(self currentDirectory baseName)
-	]
+        (dir := self currentDirectory) notNil ifTrue:[
+            self window label:(dir baseName)
+        ]
     ].
 
     "Modified: / 06-07-2011 / 09:41:50 / cg"
@@ -1685,32 +1685,33 @@
 
     toolBarVisible := self toolBarVisibleHolder value.
     toolBarVisible ifTrue:[
-	toolBar := builder componentAt:#ToolbarBox.
-	topOffset := topOffset + toolBar height.
+        toolBar := builder componentAt:#ToolbarBox.
+        topOffset := topOffset + toolBar height.
     ].
 
     filenameEntryFieldVisible := self filenameEntryFieldVisibleHolder value.
     filenameEntryFieldVisible ifTrue:[
-	filenameEntryField := builder componentAt:#FilenameEntryFieldBox.
-	d := filenameEntryField layout bottomOffset - filenameEntryField layout topOffset.
-	filenameEntryField layout topOffset:topOffset bottomOffset:topOffset + d.
-	topOffset := topOffset + filenameEntryField height.
-	filenameEntryField container notNil ifTrue:[
-	    filenameEntryField containerChangedSize.
-	].
+        filenameEntryField := builder componentAt:#FilenameEntryFieldBox.
+        d := filenameEntryField layout bottomOffset - filenameEntryField layout topOffset.
+        filenameEntryField layout topOffset:topOffset bottomOffset:topOffset + d.
+        topOffset := topOffset + filenameEntryField height.
+        filenameEntryField container notNil ifTrue:[
+            filenameEntryField containerChangedSize.
+        ].
     ].
 
     infoBarVisible := self infoBarVisibleHolder value.
     infoBarVisible ifTrue:[
-	infoBar := builder componentAt:#InfoBox.
-	bottomOffset := bottomOffset - infoBar height.
+        infoBar := builder componentAt:#InfoBox.
+        bottomOffset := bottomOffset - infoBar height.
     ].
 
     vPanel := builder componentAt:#BrowserBox.
-    vPanel layout topOffset:topOffset+1.
-    vPanel layout bottomOffset:bottomOffset-1.
+    vPanel layout 
+        topOffset:topOffset+1
+        bottomOffset:bottomOffset-1.
     vPanel container notNil ifTrue:[
-	vPanel containerChangedSize.
+        vPanel containerChangedSize.
     ].
 ! !
 
@@ -1843,10 +1844,11 @@
     "use nearly the full screen height, but at least 768px if available.
      Keep the width as defined in the windowSpec"
 
-    |maxHeight|
+    |w maxHeight|
 
-    maxHeight := self window device usableHeightAt:self window origin.
-    ^ Point x:nil y:(((maxHeight - 200) max:self window extent y) min:maxHeight).
+    w := self window.
+    maxHeight := w device usableHeightAt:w origin.
+    ^ Point x:nil y:(((maxHeight - 200) max:w extent y) min:maxHeight).
 !
 
 getAllFilesAsStrings
@@ -2017,7 +2019,7 @@
 !FileBrowserV2 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.206 2013-04-16 13:04:04 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.207 2013-04-28 13:34:16 cg Exp $'
 ! !