Skip to content
Browse files

Fixed issue #839: Splash screen doesn't refresh anymore.

  • Loading branch information...
1 parent 197ddbe commit 900bdcaca045f2b62e3ad53d407e6925094712a4 @Basewq committed Mar 19, 2012
Showing with 15 additions and 8 deletions.
  1. +13 −5 GitExtensions/Program.cs
  2. +2 −3 GitUI/FormSplash.cs
View
18 GitExtensions/Program.cs
@@ -21,16 +21,22 @@ private static void Main()
Application.SetCompatibleTextRenderingDefault(false);
string[] args = Environment.GetCommandLineArgs();
- FormSplash.Show("Load settings");
+ FormSplash.ShowSplash();
+ Application.DoEvents();
+
Settings.LoadSettings();
if (Settings.RunningOnWindows())
{
//Quick HOME check:
- FormSplash.SetAction("Check home path");
+ FormSplash.SetAction("Checking home path...");
+ Application.DoEvents();
+
FormFixHome.CheckHomePath();
}
//Register plugins
- FormSplash.SetAction("Load plugins");
+ FormSplash.SetAction("Loading plugins...");
+ Application.DoEvents();
+
PluginLoader.LoadAsync();
if (string.IsNullOrEmpty(Settings.Translation))
@@ -48,7 +54,9 @@ private static void Main()
!Settings.GetValue<string>("checksettings", null).ToString().Equals("false", StringComparison.OrdinalIgnoreCase) ||
string.IsNullOrEmpty(Settings.GitCommand))
{
- FormSplash.SetAction("Check settings");
+ FormSplash.SetAction("Checking settings...");
+ Application.DoEvents();
+
using (var settings = new FormSettings())
{
if (!settings.CheckSettings())
@@ -88,7 +96,7 @@ private static void Main()
Settings.WorkingDir = findWorkingDir;
}
- FormSplash.Hide();
+ FormSplash.HideSplash();
if (args.Length <= 1)
{
View
5 GitUI/FormSplash.cs
@@ -16,7 +16,7 @@ public partial class FormSplash : Form
private static FormSplash instance;
- public static void Show(string action)
+ public static void ShowSplash()
{
instance = new FormSplash();
instance.Show();
@@ -28,7 +28,7 @@ public static void SetAction(string action)
instance.SetActionText(action);
}
- public new static void Hide()
+ public static void HideSplash()
{
if (instance != null)
{
@@ -60,7 +60,6 @@ private void SetFont()
private void SetActionText(string action)
{
_NO_TRANSLATE_actionLabel.Text = action;
- Refresh();
}
protected override void OnLoad(EventArgs e)

0 comments on commit 900bdca

Please sign in to comment.
Something went wrong with that request. Please try again.