Update check timers have been fixed.
This commit is contained in:
@@ -27,14 +27,17 @@ std::wstring ConvertUtf8ToWide(const std::string& str);
|
|||||||
UINT WINAPI Updater(LPVOID)
|
UINT WINAPI Updater(LPVOID)
|
||||||
{
|
{
|
||||||
logger.Out(L"Entering the %s() function", TEXT(__FUNCTION__));
|
logger.Out(L"Entering the %s() function", TEXT(__FUNCTION__));
|
||||||
|
logger.Out(L"[UPDT] Sleeping %d seconds", T0);
|
||||||
|
|
||||||
|
Sleep(T0 * 1000); // 10 seconds
|
||||||
|
|
||||||
if (!GetLatestRelease(GITHUB_URI))
|
if (!GetLatestRelease(GITHUB_URI))
|
||||||
{
|
{
|
||||||
logger.Out(L"[UPDT] %s(%d): Failed getting releases!", TEXT(__FUNCTION__), __LINE__);
|
logger.Out(L"[UPDT] %s(%d): Failed getting releases!", TEXT(__FUNCTION__), __LINE__);
|
||||||
|
|
||||||
MessageBoxW(NULL, L"Failed getting releases!", szTitle, MB_OK | MB_ICONERROR);
|
MessageBoxW(NULL, L"Failed getting releases!", szTitle, MB_OK | MB_ICONERROR);
|
||||||
_endthreadex(101);
|
|
||||||
return 101;
|
return 101;
|
||||||
|
_endthreadex(101);
|
||||||
}
|
}
|
||||||
|
|
||||||
std::wstring j_tag_name, j_file_name, j_file_ext, j_file_url, j_page_url;
|
std::wstring j_tag_name, j_file_name, j_file_ext, j_file_url, j_page_url;
|
||||||
@@ -52,8 +55,8 @@ UINT WINAPI Updater(LPVOID)
|
|||||||
{
|
{
|
||||||
std::string u = (*it).second.get<std::string>();
|
std::string u = (*it).second.get<std::string>();
|
||||||
logger.Out(L"[UPDT] %s(%d): Error! The url is %s", TEXT(__FUNCTION__), __LINE__, u);
|
logger.Out(L"[UPDT] %s(%d): Error! The url is %s", TEXT(__FUNCTION__), __LINE__, u);
|
||||||
_endthreadex(102);
|
|
||||||
return 102;
|
return 102;
|
||||||
|
_endthreadex(102);
|
||||||
}
|
}
|
||||||
|
|
||||||
for (it = obj.begin(); it != obj.end(); it++)
|
for (it = obj.begin(); it != obj.end(); it++)
|
||||||
@@ -76,8 +79,8 @@ UINT WINAPI Updater(LPVOID)
|
|||||||
else
|
else
|
||||||
{
|
{
|
||||||
logger.Out(L"[UPDT] %s(%d): Error! Cannot recognize JSON object!", TEXT(__FUNCTION__), __LINE__);
|
logger.Out(L"[UPDT] %s(%d): Error! Cannot recognize JSON object!", TEXT(__FUNCTION__), __LINE__);
|
||||||
_endthreadex(103);
|
|
||||||
return 103;
|
return 103;
|
||||||
|
_endthreadex(103);
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t pos = 0;
|
size_t pos = 0;
|
||||||
@@ -116,8 +119,8 @@ UINT WINAPI Updater(LPVOID)
|
|||||||
|
|
||||||
logger.Out(L"[UPDT] Exit from the %s() function", TEXT(__FUNCTION__));
|
logger.Out(L"[UPDT] Exit from the %s() function", TEXT(__FUNCTION__));
|
||||||
|
|
||||||
_endthreadex(0);
|
|
||||||
return 0;
|
return 0;
|
||||||
|
_endthreadex(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GetLatestRelease(const std::wstring& urn)
|
bool GetLatestRelease(const std::wstring& urn)
|
||||||
|
|||||||
@@ -237,13 +237,13 @@ LRESULT CALLBACK WndProc(HWND hMainWnd, UINT message, WPARAM wParam, LPARAM lPar
|
|||||||
|
|
||||||
if (fCheckUpdates)
|
if (fCheckUpdates)
|
||||||
{
|
{
|
||||||
if (!SetTimer(hMainWnd, IDT_TIMER, 30000, NULL)) // 30 seconds
|
if (!SetTimer(hMainWnd, IDT_TIMER, (T1 * 1000 - T0 * 1000), NULL)) // 50 seconds
|
||||||
{
|
{
|
||||||
logger.Out(L"%s(%d): Creating timer failed!", TEXT(__FUNCTION__), __LINE__);
|
logger.Out(L"%s(%d): Creating timer failed!", TEXT(__FUNCTION__), __LINE__);
|
||||||
ShowError(IDS_ERR_TIMER);
|
ShowError(IDS_ERR_TIMER);
|
||||||
fCheckUpdates = FALSE;
|
fCheckUpdates = FALSE;
|
||||||
}
|
}
|
||||||
logger.Out(L"%s(%d): Timer successfully created", TEXT(__FUNCTION__), __LINE__);
|
logger.Out(L"%s(%d): Timer successfully created (%d sec)", TEXT(__FUNCTION__), __LINE__, (T1 - T0));
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifndef _DEBUG
|
#ifndef _DEBUG
|
||||||
@@ -284,13 +284,13 @@ LRESULT CALLBACK WndProc(HWND hMainWnd, UINT message, WPARAM wParam, LPARAM lPar
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if (!SetTimer(hMainWnd, IDT_TIMER, 86400000, NULL)) // 1 day
|
if (!SetTimer(hMainWnd, IDT_TIMER, (T2 * 1000), NULL)) // 1 day
|
||||||
{
|
{
|
||||||
logger.Out(L"%s(%d): Creating timer failed!", TEXT(__FUNCTION__), __LINE__);
|
logger.Out(L"%s(%d): Creating timer failed!", TEXT(__FUNCTION__), __LINE__);
|
||||||
ShowError(IDS_ERR_TIMER);
|
ShowError(IDS_ERR_TIMER);
|
||||||
fCheckUpdates = FALSE;
|
fCheckUpdates = FALSE;
|
||||||
}
|
}
|
||||||
logger.Out(L"%s(%d): Timer successfully created", TEXT(__FUNCTION__), __LINE__);
|
logger.Out(L"%s(%d): Timer successfully created (%d sec)", TEXT(__FUNCTION__), __LINE__, T2);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -4,6 +4,10 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include "resource.h"
|
#include "resource.h"
|
||||||
|
|
||||||
|
#define T0 10
|
||||||
|
#define T1 60
|
||||||
|
#define T2 86400
|
||||||
|
|
||||||
#define MAX_LOADSTRING 50
|
#define MAX_LOADSTRING 50
|
||||||
|
|
||||||
// Windows Header Files
|
// Windows Header Files
|
||||||
|
|||||||
Reference in New Issue
Block a user