From 0919a063c3078015dc0195a218f77913d99ee268 Mon Sep 17 00:00:00 2001
From: compudj <compudj@04897980-b3bd-0310-b5e0-8ef037075253>
Date: Thu, 18 Dec 2008 13:54:37 +0000
Subject: [PATCH] update version

git-svn-id: http://ltt.polymtl.ca/svn@3187 04897980-b3bd-0310-b5e0-8ef037075253
---
 trunk/lttv/configure.in                                | 2 +-
 trunk/lttv/doc/developer/lttng-lttv-compatibility.html | 2 ++
 trunk/lttv/ltt/marker.c                                | 4 ++++
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/trunk/lttv/configure.in b/trunk/lttv/configure.in
index d73e1f06..a86500b4 100644
--- a/trunk/lttv/configure.in
+++ b/trunk/lttv/configure.in
@@ -23,7 +23,7 @@
 AC_PREREQ(2.57)
 AC_INIT(FULL-PACKAGE-NAME, VERSION, BUG-REPORT-ADDRESS)
 #AC_WITH_LTDL  # not needed ?
-AM_INIT_AUTOMAKE(lttv,0.12.3-17122008)
+AM_INIT_AUTOMAKE(lttv,0.12.4-18122008)
 AM_CONFIG_HEADER(config.h)
 AM_PROG_LIBTOOL
 
diff --git a/trunk/lttv/doc/developer/lttng-lttv-compatibility.html b/trunk/lttv/doc/developer/lttng-lttv-compatibility.html
index f7497ebc..ddb0ade8 100644
--- a/trunk/lttv/doc/developer/lttng-lttv-compatibility.html
+++ b/trunk/lttv/doc/developer/lttng-lttv-compatibility.html
@@ -3214,6 +3214,7 @@ powerpc64, s390, sparc, sparc64.<br>
 0.12.1<br>
 0.12.2<br>
 0.12.3<br>
+0.12.4<br>
 </td>
 <td style="vertical-align: top;">
 0.65<br>
@@ -3249,6 +3250,7 @@ ltt-control 0.61 changes the command line arguments. See updated QUICKSTART.<br>
 LTTng 0.68 implements /mnt/debugfs/ltt/write_event for basic userspace tracing.<br>
 LTTV 0.12.3 updates the filter for channel_name.event_name, adds channel.name=
 support and event.subname= support.<br>
+LTTV 0.12.4 fixes marker support so it handles disabled channels.<br>
 </td>
 <td style="vertical-align: top;">
 </td>
diff --git a/trunk/lttv/ltt/marker.c b/trunk/lttv/ltt/marker.c
index 89f47be0..07b5c08e 100644
--- a/trunk/lttv/ltt/marker.c
+++ b/trunk/lttv/ltt/marker.c
@@ -431,6 +431,8 @@ int marker_format_event(LttTrace *trace, GQuark channel, GQuark name,
   GArray *group;
 
   group = g_datalist_id_get_data(&trace->tracefiles, channel);
+  if (!group)
+    return -ENOENT;
   g_assert(group->len > 0);
   mdata = g_array_index (group, LttTracefile, 0).mdata;
 
@@ -471,6 +473,8 @@ int marker_id_event(LttTrace *trace, GQuark channel, GQuark name, guint16 id,
     g_quark_to_string(name), id);
 
   group = g_datalist_id_get_data(&trace->tracefiles, channel);
+  if (!group)
+    return -ENOENT;
   g_assert(group->len > 0);
   mdata = g_array_index (group, LttTracefile, 0).mdata;
 
-- 
2.34.1