VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Common
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2018-03-13 17:33:28 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2018-03-13 17:34:21 (GMT)
commitd20df7c9908525f496157b157556a090ca4588d8 (patch)
treef12f45f8e5d27f57655e9eb4f28dca04dce6c880 /src/Common
parent6c69cbfd2947013aa9acfdaf3dd05f8701867d51 (diff)
downloadVeraCrypt-d20df7c9908525f496157b157556a090ca4588d8.zip
VeraCrypt-d20df7c9908525f496157b157556a090ca4588d8.tar.gz
Windows: when /silent specified in command line, avoid performing any WIN32 UI calls. This fixes issue of current application losing focus when VeraCrypt is run with /quit /silent (cf https://github.com/veracrypt/VeraCrypt/issues/274)
Diffstat (limited to 'src/Common')
-rw-r--r--src/Common/Dlgcode.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/Common/Dlgcode.c b/src/Common/Dlgcode.c
index ec805e4..6a79bcd 100644
--- a/src/Common/Dlgcode.c
+++ b/src/Common/Dlgcode.c
@@ -1790,13 +1790,13 @@ static int g_waitCursorCounter = 0;
void
WaitCursor ()
{
- static HCURSOR hcWait;
+ static HCURSOR hcWait = NULL;
if (hcWait == NULL)
hcWait = LoadCursor (NULL, IDC_WAIT);
if ((g_waitCursorCounter == 0) || (hCursor != hcWait))
{
- SetCursor (hcWait);
+ if (!Silent) SetCursor (hcWait);
hCursor = hcWait;
}
g_waitCursorCounter++;
@@ -1805,14 +1805,14 @@ WaitCursor ()
void
NormalCursor ()
{
- static HCURSOR hcArrow;
+ static HCURSOR hcArrow = NULL;
if (hcArrow == NULL)
hcArrow = LoadCursor (NULL, IDC_ARROW);
if (g_waitCursorCounter > 0)
g_waitCursorCounter--;
if (g_waitCursorCounter == 0)
{
- SetCursor (hcArrow);
+ if (!Silent) SetCursor (hcArrow);
hCursor = NULL;
}
}
@@ -1820,12 +1820,12 @@ NormalCursor ()
void
ArrowWaitCursor ()
{
- static HCURSOR hcArrowWait;
+ static HCURSOR hcArrowWait = NULL;
if (hcArrowWait == NULL)
hcArrowWait = LoadCursor (NULL, IDC_APPSTARTING);
if ((g_waitCursorCounter == 0) || (hCursor != hcArrowWait))
{
- SetCursor (hcArrowWait);
+ if (!Silent) SetCursor (hcArrowWait);
hCursor = hcArrowWait;
}
g_waitCursorCounter++;
@@ -1833,7 +1833,7 @@ ArrowWaitCursor ()
void HandCursor ()
{
- static HCURSOR hcHand;
+ static HCURSOR hcHand = NULL;
if (hcHand == NULL)
hcHand = LoadCursor (NULL, IDC_HAND);
SetCursor (hcHand);