isa/mutter
1
0
Fork 0
mirror of https://github.com/brl/mutter.git synced 2024-11-22 08:00:42 -05:00
Code Issues Packages Projects Releases Wiki Activity

meta_window_move_frame(): fix crash when frame is NULL

Browse Source 
When meta_frame_calc_borders() was made to take a NULL frame argument,
a crash was accidentally introduced into meta_window_move_frame().

This partially reverts 8c1b2d5.

https://bugzilla.gnome.org/show_bug.cgi?id=675254
This commit is contained in:
Owen W. Taylor 2012-05-01 13:40:08 -04:00
parent ba4f008d40
commit c669a3892e
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/core/window.c
View File

@ -5080,18 +5080,20 @@ meta_window_move_frame (MetaWindow *window,
{ {
int x = root_x_nw; int x = root_x_nw;
int y = root_y_nw; int y = root_y_nw;
MetaFrameBorders borders;
meta_frame_calc_borders (window->frame, &borders); if (window->frame)
{
/* root_x_nw and root_y_nw correspond to where the top of MetaFrameBorders borders;
* the visible frame should be. Offset by the distance between meta_frame_calc_borders (window->frame, &borders);
* the origin of the window and the origin of the enclosing
* window decorations.
*/
x += window->frame->child_x - borders.invisible.left;
y += window->frame->child_y - borders.invisible.top;
/* root_x_nw and root_y_nw correspond to where the top of
* the visible frame should be. Offset by the distance between
* the origin of the window and the origin of the enclosing
* window decorations.
*/
x += window->frame->child_x - borders.invisible.left;
y += window->frame->child_y - borders.invisible.top;
}
meta_window_move (window, user_op, x, y); meta_window_move (window, user_op, x, y);
} }