[EGIT] [apps/terminology] master 01/01: fix segv when closing terms in splits

[Boris Faure]

billiob pushed a commit to branch master.

http://git.enlightenment.org/apps/terminology.git/commit/?id=ac76c0fae2dd85af3c84ce82240374c10f7b5f56

commit ac76c0fae2dd85af3c84ce82240374c10f7b5f56
Author: Boris Faure <bill...@gmail.com>
Date:   Sat Sep 21 17:20:19 2013 +0200

    fix segv when closing terms in splits
---
 src/bin/main.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/bin/main.c b/src/bin/main.c
index b530cdf..5e3fa02 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -531,10 +531,10 @@ _split_merge(Split *spp, Split *sp, const char *slot)
         spp->s2->parent = spp;
         spp->horizontal = sp->horizontal;
         o = sp->panes;
-        /* slot is the empty part. the part that needs to be unset is the
-         * other one */
+        elm_object_part_content_unset(sp->parent->panes, slot);
         elm_object_part_content_unset(sp->parent->panes,
-                       (!strcmp(slot, PANES_TOP)) ? PANES_BOTTOM : PANES_TOP);
+                                      (!strcmp(slot, PANES_TOP)) ?
+                                      PANES_BOTTOM : PANES_TOP);
         if (spp->parent)
           {
              elm_object_part_content_unset(spp->parent->panes, slot);

--