summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/events.c7
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 43865d1..2b47a9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2004-12-08 Shawn Betts <katia_dilkina@verizon.net>
+2004-12-08 Shawn Betts <sabetts@vcn.bc.ca>
+
+ * src/events.c (destroy_window): make sure the current screen is
+ the windows screen before calling set_active_frame.
+ (unmap_notify): likewise
* src/actions.c (frestore): use strtok_r.
diff --git a/src/events.c b/src/events.c
index c7498b1..bb9f2cb 100644
--- a/src/events.c
+++ b/src/events.c
@@ -109,7 +109,9 @@ unmap_notify (XEvent *ev)
if (frame)
{
cleanup_frame (frame);
- if (frame->number == win->scr->current_frame) set_active_frame (frame);
+ if (frame->number == win->scr->current_frame
+ && current_screen() == win->scr)
+ set_active_frame (frame);
}
withdraw_window (win);
@@ -208,7 +210,8 @@ destroy_window (XDestroyWindowEvent *ev)
if (frame)
{
cleanup_frame (frame);
- if (frame->number == win->scr->current_frame)
+ if (frame->number == win->scr->current_frame
+ && current_screen() == win->scr)
set_active_frame (frame);
}
withdraw_window (win);