summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
authorJoaquín Ignacio Aramendía <[email protected]>2014-06-25 22:43:17 -0300
committerJoaquín Ignacio Aramendía <[email protected]>2014-06-26 20:26:23 -0300
commit12e9874307e73f613036ad8f370bc05650c84298 (patch)
tree1dfb0b2615969444d3535d6d2c09a620c15d74fd /src/core
parent4f08084b0ff11e1a7ebbdd5385fd6b2969b7f36e (diff)
downloadmarco-12e9874307e73f613036ad8f370bc05650c84298.tar.bz2
marco-12e9874307e73f613036ad8f370bc05650c84298.tar.xz
Bugfix: Correct was_minimized flag transition
Diffstat (limited to 'src/core')
-rw-r--r--src/core/window.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/window.c b/src/core/window.c
index 631229b7..694ba99e 100644
--- a/src/core/window.c
+++ b/src/core/window.c
@@ -1463,6 +1463,7 @@ finish_unminimize (gpointer data)
MetaWindow *window = data;
meta_window_show (window);
+ window->was_minimized = FALSE;
window->effect_pending = META_EFFECT_NONE;
}
@@ -2355,7 +2356,6 @@ meta_window_show (MetaWindow *window)
}
else if (window->was_minimized)
{
- window->was_minimized = FALSE;
meta_window_focus(window, timestamp);
}