summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--src/window.c9
2 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index f551244..6184b63 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-24 Shawn Betts <sabetts@sfu.ca>
+
+ * src/window.c (goto_window): don't do anything if the window is
+ already the current window.
+ (set_active_window): don't abort if last_win and win are the same.
+
2003-08-22 Shawn Betts <sabetts@sfu.ca>
* src/window.c (set_active_window): don't do anything if the
diff --git a/src/window.c b/src/window.c
index d6add93..17098fe 100644
--- a/src/window.c
+++ b/src/window.c
@@ -471,11 +471,6 @@ set_active_window (rp_window *win)
if (last_win) PRINT_DEBUG (("last window: %s\n", window_name (last_win)));
PRINT_DEBUG (("new window: %s\n", window_name (win)));
- /* If we're dealing with the same window, just abort. There is
- nothing to do. */
- if (last_win == win)
- return;
-
/* Make sure the window comes up full screen */
maximize (win);
@@ -510,6 +505,10 @@ goto_window (rp_window *win)
{
rp_frame *frame;
+ /* There is nothing to do if it is already the current window. */
+ if (current_window() == win)
+ return;
+
frame = find_windows_frame (win);
if (frame)
{