Public/VeraCrypt
1
0
Fork 0
mirror of https://github.com/veracrypt/VeraCrypt.git synced 2025-11-11 19:08:26 -06:00
Code Activity

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)

Browse Source
This commit is contained in:
Mounir IDRASSI
2018-03-13 18:33:28 +01:00
parent 6c69cbfd29
commit d20df7c990
2 changed files with 118 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Common/Dlgcode.c
View File

@@ -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);