--- a/ScreenLock.st	Wed May 24 12:49:46 2000 +0200
+++ b/ScreenLock.st	Wed May 24 12:50:41 2000 +0200
@@ -219,8 +219,11 @@
      Reset the inactive timer.
      If locked, eat all user events (for security)"
 
-    lastInactiveTime := nil.
-    ^ lockedViews notNil and:[lockedViews includes:v]
+    lockedViews isNil ifTrue:[
+        lastInactiveTime := nil.        
+        ^ false.
+    ].
+    ^ lockedViews includes:v.
 !
 
 initializeForDevice:aWorkstation
@@ -234,7 +237,12 @@
 lockScreen
 
     lockedViews := workstation allViews.
-    hiddenViews := lockedViews select:[:v| v isTopView and:[v realized]].
+    hiddenViews := lockedViews select:[:v|
+        v shown and:[
+            v isPopUpView ifTrue:[v hide].
+            v isTopView.
+        ].
+    ].
 
     hiddenViews do:[:v|
         v beInvisible.
@@ -244,8 +252,9 @@
 
 unlockScreen
 
-    hiddenViews do:[:tv|
-        tv beVisible.
+    lastInactiveTime := nil.
+    hiddenViews do:[:v|
+        v beVisible.
     ].
     hiddenViews := lockedViews := nil.
 ! !
@@ -260,5 +269,5 @@
 !ScreenLock class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libview2/ScreenLock.st,v 1.2 2000-05-23 17:53:32 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libview2/ScreenLock.st,v 1.3 2000-05-24 10:50:41 stefan Exp $'
 ! !