- Only use one instance of LogForm

Signed-off-by: Syrone Wong <wong.syrone@gmail.com>
This commit is contained in:
Syrone Wong
2016-09-16 00:47:05 +08:00
parent be63f96d50
commit 33b2ca8c8a
6 changed files with 69 additions and 69 deletions
+11 -9
View File
@@ -13,7 +13,9 @@ namespace Shadowsocks
{
static class Program
{
static ShadowsocksController controller;
private static ShadowsocksController _controller;
// XXX: Don't change this name
private static MenuViewController _viewController;
/// <summary>
/// 应用程序的主入口点。
@@ -61,9 +63,9 @@ namespace Shadowsocks
#else
Logging.OpenLogFile();
#endif
controller = new ShadowsocksController();
MenuViewController viewController = new MenuViewController(controller);
controller.Start();
_controller = new ShadowsocksController();
_viewController = new MenuViewController(_controller);
_controller.Start();
Application.Run();
}
}
@@ -88,10 +90,10 @@ namespace Shadowsocks
{
case PowerModes.Resume:
Logging.Info("os wake up");
controller?.Start();
_controller?.Start();
break;
case PowerModes.Suspend:
controller?.Stop();
_controller?.Stop();
Logging.Info("os suspend");
break;
}
@@ -99,10 +101,10 @@ namespace Shadowsocks
private static void Application_ApplicationExit(object sender, EventArgs e)
{
if (controller != null)
if (_controller != null)
{
controller.Stop();
controller = null;
_controller.Stop();
_controller = null;
}
}
}