summaryrefslogtreecommitdiff
path: root/Xamarin.Forms.Core
diff options
context:
space:
mode:
authorPaul DiPietro <pauldipietro@users.noreply.github.com>2016-09-12 06:51:19 -0500
committerRui Marinho <me@ruimarinho.net>2016-09-12 12:51:19 +0100
commit368a375f13fc2e4b5ff00dbbdd7a2d6bb53988eb (patch)
tree35a8bc610aa00035dc70094737af529921806123 /Xamarin.Forms.Core
parent420ceb37d0d1d78dde17c717614c6874684a399e (diff)
downloadxamarin-forms-368a375f13fc2e4b5ff00dbbdd7a2d6bb53988eb.tar.gz
xamarin-forms-368a375f13fc2e4b5ff00dbbdd7a2d6bb53988eb.tar.bz2
xamarin-forms-368a375f13fc2e4b5ff00dbbdd7a2d6bb53988eb.zip
[C] Prevent enabling a Button via setting a Command (#308)
Diffstat (limited to 'Xamarin.Forms.Core')
-rw-r--r--Xamarin.Forms.Core/Button.cs4
1 files changed, 1 insertions, 3 deletions
diff --git a/Xamarin.Forms.Core/Button.cs b/Xamarin.Forms.Core/Button.cs
index 31573076..a4dffc78 100644
--- a/Xamarin.Forms.Core/Button.cs
+++ b/Xamarin.Forms.Core/Button.cs
@@ -180,7 +180,7 @@ namespace Xamarin.Forms
void CommandCanExecuteChanged(object sender, EventArgs eventArgs)
{
ICommand cmd = Command;
- if (cmd != null)
+ if (cmd != null && IsEnabled)
IsEnabledCore = cmd.CanExecute(CommandParameter);
}
@@ -225,8 +225,6 @@ namespace Xamarin.Forms
Command.CanExecuteChanged += CommandCanExecuteChanged;
CommandCanExecuteChanged(this, EventArgs.Empty);
}
- else
- IsEnabledCore = true;
}
void OnSourceChanged(object sender, EventArgs eventArgs)