Merge pull request #28 from rveltz/ChrisRackauckas-patch-1

More robust error checking
rveltz · May 1, 2017 · cb5e533 · cb5e533
2 parents ebf31c4 + 35e0c99
commit cb5e533
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/common.jl b/src/common.jl
@@ -8,6 +8,7 @@ function solve{uType,tType,isinplace}(
     tstops=Float64[],
     saveat=Float64[],maxiter=Int(1e5),
     save_start=true,
+    callback = nothing,
     timeseries_errors=true,save_everystep= isempty(saveat),
     save_timeseries = nothing,
     userdata=nothing,kwargs...)
@@ -21,7 +22,7 @@ function solve{uType,tType,isinplace}(
         error("This solver is not able to use mass matrices.")
     end
 
-    if callback != nothing
+    if callback != nothing || prob.callback != nothing
         error("LSODA is not compatible with callbacks.")
     end