diff --git a/ShareX.HelpersLib/Native/NativeMethods_Helpers.cs b/ShareX.HelpersLib/Native/NativeMethods_Helpers.cs
index 2b268aba4..c686d0b36 100644
--- a/ShareX.HelpersLib/Native/NativeMethods_Helpers.cs
+++ b/ShareX.HelpersLib/Native/NativeMethods_Helpers.cs
@@ -364,6 +364,11 @@ public static bool IsWindowCloaked(IntPtr handle)
return false;
}
+ public static bool IsActive(IntPtr handle)
+ {
+ return GetForegroundWindow() == handle;
+ }
+
public static void RestoreWindow(IntPtr handle)
{
WINDOWPLACEMENT wp = new WINDOWPLACEMENT();
diff --git a/ShareX.HelpersLib/Native/WindowInfo.cs b/ShareX.HelpersLib/Native/WindowInfo.cs
index 0d3edfe60..08a8c3f13 100644
--- a/ShareX.HelpersLib/Native/WindowInfo.cs
+++ b/ShareX.HelpersLib/Native/WindowInfo.cs
@@ -92,7 +92,7 @@ public int ProcessId
public bool IsCloaked => NativeMethods.IsWindowCloaked(Handle);
- public bool IsActive => NativeMethods.GetForegroundWindow() == Handle;
+ public bool IsActive => NativeMethods.IsActive(Handle);
public WindowInfo(IntPtr handle)
{
diff --git a/ShareX/Forms/FirstTimeUploadForm.Designer.cs b/ShareX/Forms/FirstTimeUploadForm.Designer.cs
index 36acc87fe..044d2634e 100644
--- a/ShareX/Forms/FirstTimeUploadForm.Designer.cs
+++ b/ShareX/Forms/FirstTimeUploadForm.Designer.cs
@@ -44,6 +44,7 @@ private void InitializeComponent()
//
// btnYes
//
+ this.btnYes.DialogResult = System.Windows.Forms.DialogResult.Yes;
resources.ApplyResources(this.btnYes, "btnYes");
this.btnYes.Name = "btnYes";
this.btnYes.UseVisualStyleBackColor = true;
@@ -51,6 +52,7 @@ private void InitializeComponent()
//
// btnNo
//
+ this.btnNo.DialogResult = System.Windows.Forms.DialogResult.No;
resources.ApplyResources(this.btnNo, "btnNo");
this.btnNo.Name = "btnNo";
this.btnNo.UseVisualStyleBackColor = true;
diff --git a/ShareX/Forms/FirstTimeUploadForm.cs b/ShareX/Forms/FirstTimeUploadForm.cs
index dc59b1061..75eec47fa 100644
--- a/ShareX/Forms/FirstTimeUploadForm.cs
+++ b/ShareX/Forms/FirstTimeUploadForm.cs
@@ -49,19 +49,16 @@ public FirstTimeUploadForm()
private void UpdateCountdown()
{
- if (!IsDisposed)
+ if (countdown < 1)
{
- if (countdown < 1)
- {
- btnYes.Text = textYes;
- btnYes.Enabled = true;
- tCountdown.Stop();
- }
- else
- {
- btnYes.Text = textYes + " (" + countdown + ")";
- countdown--;
- }
+ btnYes.Text = textYes;
+ btnYes.Enabled = true;
+ tCountdown.Stop();
+ }
+ else
+ {
+ btnYes.Text = textYes + " (" + countdown + ")";
+ countdown--;
}
}
@@ -72,7 +69,10 @@ private void FirstTimeUploadForm_Shown(object sender, System.EventArgs e)
private void tCountdown_Tick(object sender, System.EventArgs e)
{
- UpdateCountdown();
+ if (!IsDisposed && NativeMethods.IsActive(Handle))
+ {
+ UpdateCountdown();
+ }
}
private void btnYes_Click(object sender, System.EventArgs e)
diff --git a/ShareX/Forms/FirstTimeUploadForm.resx b/ShareX/Forms/FirstTimeUploadForm.resx
index 11b658fd9..77af4442d 100644
--- a/ShareX/Forms/FirstTimeUploadForm.resx
+++ b/ShareX/Forms/FirstTimeUploadForm.resx
@@ -132,7 +132,7 @@
1
- Are you sure you want to upload screenshots?
+ Do you want ShareX to upload screenshots?
Press "No" to cancel the current upload and disable screenshot auto uploading.
@@ -218,7 +218,7 @@ Press "No" to cancel the current upload and disable screenshot auto uploading.
0
- Important!
+ Attention!
MiddleCenter