backed out partial fix for ticket:104

git-svn-id: http://gnuradio.org/svn/gnuradio/trunk@4150 221aa14e-8319-0410-a670-987f0aec2ac5

1 files changed, 4 insertions, 7 deletions

diff --git a/gnuradio-core/src/lib/io/gr_oscope_guts.cc b/gnuradio-core/src/lib/io/gr_oscope_guts.cc
index 83b523254..2a152b95a 100644
--- a/gnuradio-core/src/lib/io/gr_oscope_guts.cc
+++ b/gnuradio-core/src/lib/io/gr_oscope_guts.cc
@@ -60,11 +60,11 @@ gr_oscope_guts::gr_oscope_guts (int nchannels, double sample_rate, gr_msg_queue_
     d_update_rate (20),
     d_trigger_level (0),
     d_obi (0),
-    d_state (HOLD_OFF),
+    d_state (LOOK_FOR_TRIGGER),
     d_decimator_count (0),
     d_decimator_count_init (1),
     d_hold_off_count (0),
-    d_hold_off_count_init (OUTPUT_RECORD_SIZE/2),
+    d_hold_off_count_init (0),
     d_post_trigger_count (0),
     d_post_trigger_count_init (OUTPUT_RECORD_SIZE/2),
     d_prev_sample (0)
@@ -77,14 +77,11 @@ gr_oscope_guts::gr_oscope_guts (int nchannels, double sample_rate, gr_msg_queue_
   for (int i = 0; i < MAX_CHANNELS; i++)
     d_buffer[i] = 0;
 
-  for (int i = 0; i < d_nchannels; i++){
+  for (int i = 0; i < d_nchannels; i++)
     d_buffer[i] = new float [OUTPUT_RECORD_SIZE];
-    for (int j = 0; j < OUTPUT_RECORD_SIZE; j++)
-      d_buffer[i][j] = 0.0;
-  }
 
-  enter_hold_off ();
   update_rate_or_decimation_changed ();
+  enter_look_for_trigger ();
 }
 
 gr_oscope_guts::~gr_oscope_guts ()