From 01e4663db07808487b94efcba3a17d35d258f186 Mon Sep 17 00:00:00 2001 From: SimplestStudio Date: Thu, 7 Sep 2023 19:33:53 +0300 Subject: [PATCH] [win-linux] update manager: debug --- win-linux/extras/update-daemon/src/classes/csvcmanager.cpp | 2 +- win-linux/src/cupdatemanager.cpp | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/win-linux/extras/update-daemon/src/classes/csvcmanager.cpp b/win-linux/extras/update-daemon/src/classes/csvcmanager.cpp index f2227440e..c2c1f5ea0 100644 --- a/win-linux/extras/update-daemon/src/classes/csvcmanager.cpp +++ b/win-linux/extras/update-daemon/src/classes/csvcmanager.cpp @@ -496,7 +496,7 @@ void CSvcManager::startReplacingFiles(const tstring &packageType, const bool res if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, TEXT("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall"), 0, KEY_ALL_ACCESS, &hKey) == ERROR_SUCCESS) { wstring app_name(TEXT(WINDOW_NAME)); wstring app_key(app_name); - app_key += (packageType == TEXT("iss")) ? L"_is1" : L"_is2"; + app_key += (packageType == TEXT("iss")) ? L"_is1" : L""; if (RegOpenKeyEx(hKey, app_key.c_str(), 0, KEY_ALL_ACCESS, &hAppKey) == ERROR_SUCCESS) { wstring disp_name = app_name + L" " + ver + L" (" + currentArch().substr(1) + L")"; if (RegSetValueEx(hAppKey, TEXT("DisplayName"), 0, REG_SZ, (const BYTE*)disp_name.c_str(), (DWORD)(disp_name.length() + 1) * sizeof(WCHAR)) != ERROR_SUCCESS) diff --git a/win-linux/src/cupdatemanager.cpp b/win-linux/src/cupdatemanager.cpp index 589dc0ecc..432be1f1a 100644 --- a/win-linux/src/cupdatemanager.cpp +++ b/win-linux/src/cupdatemanager.cpp @@ -479,10 +479,7 @@ void CUpdateManager::loadUpdates() void CUpdateManager::installUpdates() { __GLOBAL_LOCK - - if (ignoredVersion() != getVersion()) { - m_dialogSchedule->addToSchedule("showStartInstallMessage"); - } + m_dialogSchedule->addToSchedule("showStartInstallMessage"); } void CUpdateManager::refreshStartPage(const Command &cmd) @@ -534,7 +531,7 @@ void CUpdateManager::refreshStartPage(const Command &cmd) void CUpdateManager::launchIntervalStartTimer() { - if (getUpdateMode() != UpdateMode::DISABLE) + if (m_pIntervalStartTimer && getUpdateMode() != UpdateMode::DISABLE) m_pIntervalStartTimer->start(); }