chibicitiberiu/rainmeter-studio
1
0
Fork 0
mirror of https://github.com/chibicitiberiu/rainmeter-studio.git synced 2024-02-24 04:33:31 +00:00
Code Issues Releases Wiki Activity

InputText: Code cleanup

Browse Source
This commit is contained in:
spx 2013-03-06 04:03:43 +09:00
parent 4cf416bd3f
commit 7f8e739ae6
3 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plugins/PluginInputText/InputBox.cs
View File

@ -329,7 +329,7 @@ namespace InputText
public void Abort() public void Abort()
{ {
this.drBackup = DialogResult.Cancel; this.drBackup = DialogResult.Abort;
this.Close(); this.Close();
} }

43
Plugins/PluginInputText/Main.cs
View File

@ -72,9 +72,24 @@ namespace InputText
if (go) if (go)
{ {
ExecuteBangParam param = new ExecuteBangParam(args); ExecuteBangParam param = new ExecuteBangParam(args);
if (ReadOptions(param)) // Read all options in advance for thread-safety if (ReadOptions(param)) // Read all options in main thread for thread-safety
{ {
ThreadPool.QueueUserWorkItem(ExecuteBangThread, param); ThreadPool.QueueUserWorkItem(_ =>
{
try
{
ExecuteCommands(param);
}
catch (Exception ex)
{
API.Log(API.LogType.Error, "C# plugin in ExecuteBang(), " + ex.GetType().ToString() + ": " + ex.Message);
}
lock (this.locker)
{
this.IsExecuteBangRunning = false;
}
});
} }
else else
{ {
@ -87,7 +102,7 @@ namespace InputText
} }
} }
internal class ExecuteBangParam private class ExecuteBangParam
{ {
internal enum BangType internal enum BangType
{ {
@ -109,28 +124,12 @@ namespace InputText
} }
}; };
private void ExecuteBangThread(object state) private bool _IsFinalizing = false;
{
ExecuteBangParam param = (ExecuteBangParam)state;
try
{
ExecuteCommands(param);
}
catch (Exception ex)
{
API.Log(API.LogType.Error, "C# plugin in ExecuteBang(), " + ex.GetType().ToString() + ": " + ex.Message);
}
lock (this.locker)
{
this.IsExecuteBangRunning = false;
}
}
internal void Dispose() internal void Dispose()
{ {
CloseInputBox(); this._IsFinalizing = true;
FinalizePluginCode();
} }
} }

5
Plugins/PluginInputText/PluginCode.cs
View File

@ -264,6 +264,9 @@ namespace InputText
lock (this._InputBoxLocker) lock (this._InputBoxLocker)
{ {
if (this._IsFinalizing)
return null;
SkinWindow skin = new SkinWindow(rm); SkinWindow skin = new SkinWindow(rm);
// Create the form. 'InputBox' is a .NET form with a textbox and two button controls on it. // Create the form. 'InputBox' is a .NET form with a textbox and two button controls on it.
@ -352,7 +355,7 @@ namespace InputText
return result; return result;
} }
private void CloseInputBox() private void FinalizePluginCode()
{ {
lock (this._InputBoxLocker) lock (this._InputBoxLocker)
{ {