fix DelegateBuilder where no canExecute function was set

tibel · Apr 29, 2015 · c1f9b58 · c1f9b58
1 parent 7e62ec1
commit c1f9b58
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/nuget/Caliburn.Light.nuspec b/nuget/Caliburn.Light.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>Caliburn.Light</id>
     <title>Caliburn.Light</title>
-    <version>2.0.0</version>
+    <version>2.0.1</version>
     <authors>Thomas Ibel</authors>
     <description>The magic-free Caliburn.Light, a powerful framework designed for building applications across current XAML platforms.</description>
     <language>en-US</language>

diff --git a/src/Caliburn.Core/Action/DelegateCommandBuilder.cs b/src/Caliburn.Core/Action/DelegateCommandBuilder.cs
@@ -117,7 +117,11 @@ public IDelegateCommand Build()
             if (!string.IsNullOrEmpty(_propertyName) && _canExecute == null)
                 throw new InvalidOperationException("PropertyName is set but CanExecute is not.");
 
-            return new DelegateCommandImpl<TTarget, object>(_target, (t, p) => _execute(t), (t, p) => _canExecute(t), _propertyName);
+            Func<TTarget, object, bool> canExecute = null;
+            if (_canExecute != null)
+                canExecute = (t, p) => _canExecute(t);
+
+            return new DelegateCommandImpl<TTarget, object>(_target, (t, p) => _execute(t), canExecute, _propertyName);
         }
     }
 

diff --git a/src/GlobalAssemblyInfo.cs b/src/GlobalAssemblyInfo.cs
@@ -15,4 +15,4 @@
 #endif
 
 [assembly: AssemblyVersion("2.0.0.0")]
-[assembly: AssemblyFileVersion("2.0.0.0")]
+[assembly: AssemblyFileVersion("2.0.1.0")]