minor bugfix

SeisData was not accepting SeisChannels as valid types during merge
jpjones76 · Feb 10, 2017 · 29ae571 · 29ae571
1 parent 2efe968
commit 29ae571
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Types/SeisData.jl b/src/Types/SeisData.jl
@@ -53,7 +53,7 @@ type SeisData
   function SeisData(U...)
     S = SeisData()
     for i = 1:1:length(U)
-      if isa(U[i],SeisData)
+      if typeof(U[i]) in [SeisChannel,SeisData]
         merge!(S, U[i])
       else
         warn(string("Tried to join incompatible type into SeisData at arg ", i, "; skipped."))