[EGIT] [core/enlightenment] master 01/01: ensure that the bg object exists before emitting signals in e_desk_show()

[Carsten Haitzler]

raster pushed a commit to branch master.

http://git.enlightenment.org/core/enlightenment.git/commit/?id=22369ffc7b09395f8433313931cd18f7e1cf03c3

commit 22369ffc7b09395f8433313931cd18f7e1cf03c3
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date:   Fri Feb 21 09:33:06 2014 +0900

    ensure that the bg object exists before emitting signals in e_desk_show()
---
 src/bin/e_desk.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/bin/e_desk.c b/src/bin/e_desk.c
index 26965d2..d622018 100644
--- a/src/bin/e_desk.c
+++ b/src/bin/e_desk.c
@@ -281,13 +281,14 @@ e_desk_show(E_Desk *desk)
    desk->zone->desk_y_current = desk->y;
    desk->visible = 1;
 
-   msg = alloca(sizeof(Edje_Message_Int_Set) + (3 * sizeof(int)));
+   msg = alloca(sizeof(Edje_Message_Int_Set) + (3 * sizeof(int)) + 8);
    msg->count = 4;
    msg->val[0] = desk->x;
    msg->val[1] = desk->zone->desk_x_count;
    msg->val[2] = desk->y;
    msg->val[3] = desk->zone->desk_y_count;
-   edje_object_message_send(desk->zone->bg_object, EDJE_MESSAGE_INT_SET, 0, 
msg);
+   if (desk->zone->bg_object)
+     edje_object_message_send(desk->zone->bg_object, EDJE_MESSAGE_INT_SET, 0, 
msg);
 
    if (desk->zone->bg_object) was_zone = 1;
    _e_desk_show_begin(desk, dx, dy);

--