Merge branch 'master' into lttng_2_0_control_dev

[deliverable/tracecompass.git] / org.eclipse.linuxtools.lttng.ui / src / org / eclipse / linuxtools / lttng / ui / views / control / model / impl / BaseEventInfo.java

diff --git a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/BaseEventInfo.java b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/BaseEventInfo.java
index 8d1a8d05585963a060a1e4f94caf68cd4096a49d..098fc5d9b0b6275486879b4eb0115053ba3b871e 100644 (file)
--- a/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/BaseEventInfo.java
+++ b/org.eclipse.linuxtools.lttng.ui/src/org/eclipse/linuxtools/lttng/ui/views/control/model/impl/BaseEventInfo.java
@@ -87,8 +87,9 @@ public class BaseEventInfo extends TraceInfo implements IBaseEventInfo {
             fEventType = TraceEventType.TRACEPOINT;
         } else if(TraceEventType.SYSCALL.getInName().equals(typeName)) {
             fEventType = TraceEventType.SYSCALL;
-        }
-        else {
+        } else if (TraceEventType.PROBE.getInName().equals(typeName)) {
+            fEventType = TraceEventType.PROBE;  
+        } else {
             fEventType = TraceEventType.UNKNOWN;
         }
     }