pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'For bug 73481' (#223) from feature/for-bug-73481 into release/v9.0.0

Browse Source
This commit is contained in:
Maxim Kadushkin
2025-04-04 07:49:38 +00:00
parent fbc4931b3c 7ee5246248
commit 7e877fc347
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
win-linux/package/windows/common.iss
View File

@ -969,7 +969,7 @@ begin
end;
if CheckCommandlineParam('/noassocheck') then begin
RegWriteStringValue(HKEY_CURRENT_USER, ExpandConstant('{#APP_REG_PATH}'), 'ignoreAssocMsg', 'true');
RegWriteStringValue(HKEY_LOCAL_MACHINE, ExpandConstant('{#APP_REG_PATH}'), 'ignoreAssocMsg', 'true');
end;
end else

3
win-linux/src/platform_win/association.cpp
View File

@ -134,8 +134,9 @@ void Association::AssociationPrivate::DialogSchedule::addToSchedule(const std::w
Association::AssociationPrivate::AssociationPrivate() : m_pDialogSchedule(new DialogSchedule(this))
{
GET_REGISTRY_SYSTEM(reg_system)
GET_REGISTRY_USER(reg_user)
m_ignoreAssocMsg = reg_user.value("ignoreAssocMsg", false).toBool() || IsPackage(Portable);
m_ignoreAssocMsg = reg_system.value("ignoreAssocMsg", false).toBool() || reg_user.value("ignoreAssocMsg", false).toBool() || IsPackage(Portable);
if (!m_ignoreAssocMsg)
m_lastCheck = time_t(reg_user.value("lastAssocCheck", 0).toLongLong());