Commit 023e8761 authored by Miller Puckette's avatar Miller Puckette
Browse files

fixed bug switching to and from GOP

parent 3bb88ee4
...@@ -697,7 +697,8 @@ void glist_menu_open(t_glist *x) ...@@ -697,7 +697,8 @@ void glist_menu_open(t_glist *x)
/* erase ourself in parent window */ /* erase ourself in parent window */
gobj_vis(&x->gl_gobj, gl2, 0); gobj_vis(&x->gl_gobj, gl2, 0);
/* get rid of our editor (and subeditors) */ /* get rid of our editor (and subeditors) */
canvas_create_editor(x, 0); if (x->gl_editor)
canvas_create_editor(x, 0);
x->gl_havewindow = 1; x->gl_havewindow = 1;
/* redraw ourself in parent window (blanked out this time) */ /* redraw ourself in parent window (blanked out this time) */
gobj_vis(&x->gl_gobj, gl2, 1); gobj_vis(&x->gl_gobj, gl2, 1);
......
...@@ -977,10 +977,10 @@ void canvas_vis(t_canvas *x, t_floatarg f) ...@@ -977,10 +977,10 @@ void canvas_vis(t_canvas *x, t_floatarg f)
any missing paramters and redraw things if necessary. */ any missing paramters and redraw things if necessary. */
void canvas_setgraph(t_glist *x, int flag, int nogoprect) void canvas_setgraph(t_glist *x, int flag, int nogoprect)
{ {
t_editor *editorwas = x->gl_editor;
if (!flag && glist_isgraph(x)) if (!flag && glist_isgraph(x))
{ {
if (editorwas) int hadeditor = (x->gl_editor != 0);
if (hadeditor)
canvas_create_editor(x, 0); canvas_create_editor(x, 0);
if (x->gl_owner && !x->gl_loading && glist_isvisible(x->gl_owner)) if (x->gl_owner && !x->gl_loading && glist_isvisible(x->gl_owner))
gobj_vis(&x->gl_gobj, x->gl_owner, 0); gobj_vis(&x->gl_gobj, x->gl_owner, 0);
...@@ -990,6 +990,8 @@ void canvas_setgraph(t_glist *x, int flag, int nogoprect) ...@@ -990,6 +990,8 @@ void canvas_setgraph(t_glist *x, int flag, int nogoprect)
gobj_vis(&x->gl_gobj, x->gl_owner, 1); gobj_vis(&x->gl_gobj, x->gl_owner, 1);
canvas_fixlinesfor(x->gl_owner, &x->gl_obj); canvas_fixlinesfor(x->gl_owner, &x->gl_obj);
} }
if (hadeditor)
canvas_create_editor(x, 1);
} }
else if (flag) else if (flag)
{ {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment