pd/src g_numbox.c,1.4,1.4.4.1 - Pd-cvs

30 Jun 2005


      Update of /cvsroot/pure-data/pd/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25127
Modified Files:
      Tag: devel_0_38
    g_numbox.c 
Log Message:
fixed t.grill's bug-report that crashed pd when nbx2 was used inappropriately
Index: g_numbox.c
===================================================================
RCS file: /cvsroot/pure-data/pd/src/g_numbox.c,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -C2 -d -r1.4 -r1.4.4.1
*** g_numbox.c	6 Sep 2004 20:20:34 -0000	1.4
--- g_numbox.c	30 Jun 2005 18:02:10 -0000	1.4.4.1
***************
*** 37,44 ****
  static void my_numbox_tick_reset(t_my_numbox *x)
  {
!     if(x->x_gui.x_fsf.x_change)
      {
          x->x_gui.x_fsf.x_change = 0;
!         glist_grab(x->x_gui.x_glist, 0, 0, 0, 0, 0);
          (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
      }
--- 37,44 ----
  static void my_numbox_tick_reset(t_my_numbox *x)
  {
!   if(x->x_gui.x_fsf.x_change && x->x_gui.x_glist)
      {
          x->x_gui.x_fsf.x_change = 0;
!         //glist_grab(x->x_gui.x_glist, 0, 0, 0, 0, 0);
          (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
      }
***************
*** 384,390 ****
          x->x_gui.x_fsf.x_change = 0;
          clock_unset(x->x_clock_reset);
!         glist_grab(x->x_gui.x_glist, 0, 0, 0, 0, 0);
          (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
- 
      }
      binbuf_addv(b, "ssiisiiffiisssiiiiiiifi", gensym("#X"),gensym("obj"),
--- 384,389 ----
          x->x_gui.x_fsf.x_change = 0;
          clock_unset(x->x_clock_reset);
!         //glist_grab(x->x_gui.x_glist, 0, 0, 0, 0, 0);
          (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
      }
      binbuf_addv(b, "ssiisiiffiisssiiiiiiifi", gensym("#X"),gensym("obj"),
***************
*** 450,454 ****
          x->x_gui.x_fsf.x_change = 0;
          clock_unset(x->x_clock_reset);
!         glist_grab(x->x_gui.x_glist, 0, 0, 0, 0, 0);
          (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
--- 449,453 ----
          x->x_gui.x_fsf.x_change = 0;
          clock_unset(x->x_clock_reset);
!         //glist_grab(x->x_gui.x_glist, 0, 0, 0, 0, 0);
          (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
***************
*** 557,562 ****
              x->x_gui.x_fsf.x_change = 1;
              clock_delay(x->x_clock_reset, 3000);
!             /* glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.ob_g,
!                 0, my_numbox_key, 0, 0); */
x->x_buf[0] = 0;
--- 556,560 ----
              x->x_gui.x_fsf.x_change = 1;
              clock_delay(x->x_clock_reset, 3000);
!              //glist_grab(x->x_gui.x_glist, &x->x_gui.x_obj.ob_g, 0, my_numbox_key, 0, 0);
x->x_buf[0] = 0;
***************
*** 566,570 ****
              x->x_gui.x_fsf.x_change = 0;
              clock_unset(x->x_clock_reset);
!             glist_grab(x->x_gui.x_glist, 0, 0, 0, 0, 0);
              x->x_buf[0] = 0;
              (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);
--- 564,568 ----
              x->x_gui.x_fsf.x_change = 0;
              clock_unset(x->x_clock_reset);
!             //glist_grab(x->x_gui.x_glist, 0, 0, 0, 0, 0);
              x->x_buf[0] = 0;
              (*x->x_gui.x_draw)(x, x->x_gui.x_glist, IEM_GUI_DRAW_MODE_UPDATE);