X-Git-Url: http://sigrok.org/gitweb/?a=blobdiff_plain;f=src%2Fsw_limits.c;h=9d80c06bf1b3dcd8bc451ccb548a8e5b53df4684;hb=bfc34b9ab0302fa0ba98eef3ce1b35c76d378589;hp=37c28667987df4f643e584466ae0b3e3eb15453f;hpb=82b9f3d116ce0c982291a2dfdd15cd8a1c4cc16e;p=libsigrok.git

diff --git a/src/sw_limits.c b/src/sw_limits.c
index 37c28667..9d80c06b 100644
--- a/src/sw_limits.c
+++ b/src/sw_limits.c
@@ -43,9 +43,7 @@
  */
 SR_PRIV void sr_sw_limits_init(struct sr_sw_limits *limits)
 {
-	limits->limit_samples = 0;
-	limits->limit_frames = 0;
-	limits->limit_msec = 0;
+	memset(limits, 0, sizeof(*limits));
 }
 
 /**
@@ -153,7 +151,7 @@ SR_PRIV gboolean sr_sw_limits_check(struct sr_sw_limits *limits)
 		}
 	}
 
-	if (limits->limit_msec) {
+	if (limits->limit_msec && limits->start_time) {
 		guint64 now;
 		now = g_get_monotonic_time();
 		if (now > limits->start_time &&