Alawn/shadowsocks-windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix first run check update

Browse Source
This commit is contained in:
Gang Zhuo
2016-03-02 20:37:10 +08:00
parent 0b59fcb8c9
commit 87ff1c158d
1 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
shadowsocks-csharp/View/MenuViewController.cs
+26 -17
View File
@@ -82,17 +82,16 @@ namespace Shadowsocks.View
Configuration config = controller.GetConfigurationCopy();
if (config.autoCheckUpdate)
{
_isStartupChecking = true;
updateChecker.CheckUpdate(config, 3000);
}
if (config.isDefault)
{
_isFirstRun = true;
ShowConfigForm();
}
else if(config.autoCheckUpdate)
{
_isStartupChecking = true;
updateChecker.CheckUpdate(config, 3000);
}
}
void controller_Errored(object sender, System.IO.ErrorEventArgs e)
@@ -261,13 +260,12 @@ namespace Shadowsocks.View
{
if (updateChecker.NewVersionFound)
{
Logging.Debug($"New version {updateChecker.LatestVersionNumber} found");
ShowBalloonTip(String.Format(I18N.GetString("Shadowsocks {0} Update Found"), updateChecker.LatestVersionNumber), I18N.GetString("Click here to update"), ToolTipIcon.Info, 5000);
_isFirstRun = false;
}
else if (!_isStartupChecking)
{
ShowBalloonTip(I18N.GetString("Shadowsocks"), I18N.GetString("No update is available"), ToolTipIcon.Info, 5000);
_isFirstRun = false;
}
_isStartupChecking = false;
}
@@ -389,7 +387,12 @@ namespace Shadowsocks.View
{
configForm = null;
Utils.ReleaseMemory(true);
ShowFirstTimeBalloon();
if (_isFirstRun)
{
CheckUpdateForFirstRun();
ShowFirstTimeBalloon();
_isFirstRun = false;
}
}
private void Config_Click(object sender, EventArgs e)
@@ -404,16 +407,22 @@ namespace Shadowsocks.View
Application.Exit();
}
private void CheckUpdateForFirstRun()
{
Configuration config = controller.GetConfigurationCopy();
if (!config.isDefault)
{
_isStartupChecking = true;
updateChecker.CheckUpdate(config, 3000);
}
}
private void ShowFirstTimeBalloon()
{
if (_isFirstRun)
{
_notifyIcon.BalloonTipTitle = I18N.GetString("Shadowsocks is here");
_notifyIcon.BalloonTipText = I18N.GetString("You can turn on/off Shadowsocks in the context menu");
_notifyIcon.BalloonTipIcon = ToolTipIcon.Info;
_notifyIcon.ShowBalloonTip(0);
_isFirstRun = false;
}
_notifyIcon.BalloonTipTitle = I18N.GetString("Shadowsocks is here");
_notifyIcon.BalloonTipText = I18N.GetString("You can turn on/off Shadowsocks in the context menu");
_notifyIcon.BalloonTipIcon = ToolTipIcon.Info;
_notifyIcon.ShowBalloonTip(0);
}
private void AboutItem_Click(object sender, EventArgs e)