chylex/TweetDuck
1
0
Fork 0
mirror of https://github.com/chylex/TweetDuck.git synced 2025-06-01 02:34:04 +02:00
Code

Remove plugin.CanRun call from PluginConfig.IsEnabled

Browse Source
This commit is contained in:
chylex 2017-04-28 16:18:46 +02:00
parent c11f36dfef
commit 4990afcdbb
3 changed files with 3 additions and 3 deletions

2
Plugins/Controls/PluginControl.cs
View File

@ -61,7 +61,7 @@ private void btnToggleState_Click(object sender, EventArgs e){
} }
private void UpdatePluginState(){ private void UpdatePluginState(){
bool isEnabled = plugin.CanRun && pluginManager.Config.IsEnabled(plugin); bool isEnabled = pluginManager.Config.IsEnabled(plugin) && plugin.CanRun;
Color textColor = isEnabled ? Color.Black : Color.FromArgb(90, 90, 90); Color textColor = isEnabled ? Color.Black : Color.FromArgb(90, 90, 90);
labelVersion.ForeColor = textColor; labelVersion.ForeColor = textColor;

2
Plugins/PluginConfig.cs
View File

@ -20,7 +20,7 @@ public void SetEnabled(Plugin plugin, bool enabled){
} }
public bool IsEnabled(Plugin plugin){ public bool IsEnabled(Plugin plugin){
return !Disabled.Contains(plugin.Identifier) && plugin.CanRun; return !Disabled.Contains(plugin.Identifier);
} }
public void DisableOfficialFromConfig(string pluginName){ public void DisableOfficialFromConfig(string pluginName){

2
Plugins/PluginManager.cs
View File

@ -115,7 +115,7 @@ public void ExecutePlugins(IFrame frame, PluginEnvironment environment, bool inc
foreach(Plugin plugin in Plugins){ foreach(Plugin plugin in Plugins){
string path = plugin.GetScriptPath(environment); string path = plugin.GetScriptPath(environment);
if (string.IsNullOrEmpty(path) || !plugin.CanRun || (!includeDisabled && !Config.IsEnabled(plugin)))continue; if (string.IsNullOrEmpty(path) || (!includeDisabled && !Config.IsEnabled(plugin)) || !plugin.CanRun)continue;
string script; string script;