Skip to content

Commit

Permalink
Merge branch 'rime:master' into a9m
Browse files Browse the repository at this point in the history
  • Loading branch information
alpzmj9 authored Jan 3, 2025
2 parents 9874f90 + 588a31f commit 5e49173
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 11 deletions.
18 changes: 12 additions & 6 deletions WeaselTSF/CandidateList.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -285,6 +285,10 @@ HRESULT CCandidateList::_UpdateUIElement() {

void CCandidateList::StartUI() {
com_ptr<ITfThreadMgr> pThreadMgr = _tsf->_GetThreadMgr();
if (!pThreadMgr) {
return;
}

com_ptr<ITfUIElementMgr> pUIElementMgr;
auto hr = pThreadMgr->QueryInterface(&pUIElementMgr);
if (FAILED(hr))
Expand All @@ -309,12 +313,14 @@ void CCandidateList::StartUI() {

void CCandidateList::EndUI() {
com_ptr<ITfThreadMgr> pThreadMgr = _tsf->_GetThreadMgr();
com_ptr<ITfUIElementMgr> emgr;
auto hr = pThreadMgr->QueryInterface(&emgr);
if (FAILED(hr))
return;
if (emgr != NULL)
emgr->EndUIElement(uiid);
if (pThreadMgr) {
com_ptr<ITfUIElementMgr> emgr;
auto hr = pThreadMgr->QueryInterface(&emgr);
if (FAILED(hr))
return;
if (emgr != NULL)
emgr->EndUIElement(uiid);
}
_DisposeUIWindow();
}

Expand Down
2 changes: 1 addition & 1 deletion install_boost.bat
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if not defined BOOST_ROOT set BOOST_ROOT=%RIME_ROOT%\deps\boost_%boost_x_y_z%
if exist "%BOOST_ROOT%\boost" goto boost_found
for %%I in ("%BOOST_ROOT%\.") do set src_dir=%%~dpI
rem download boost source
aria2c https://boostorg.jfrog.io/artifactory/main/release/%boost_version%/source/boost_%boost_x_y_z%.7z -d %src_dir%
aria2c https://archives.boost.io/release/%boost_version%/source/boost_%boost_x_y_z%.7z -d %src_dir%
pushd %src_dir%
7z x boost_%boost_x_y_z%.7z
popd
Expand Down
8 changes: 4 additions & 4 deletions output/install.nsi
Original file line number Diff line number Diff line change
Expand Up @@ -302,13 +302,13 @@ program_files:
WriteUninstaller "$INSTDIR\uninstall.exe"

; run as user...
IfSilent +2
ExecWait "$INSTDIR\WeaselDeployer.exe /install"
Goto deploy_done
IfSilent deploy_silently
ExecWait "$INSTDIR\WeaselDeployer.exe /install"
GoTo deploy_done

deploy_silently:
ExecWait "$INSTDIR\WeaselDeployer.exe /deploy"
deploy_done:
; ...

; don't redirect on 64 bit system for auto run setting
${If} ${IsNativeARM64}
Expand Down

0 comments on commit 5e49173

Please sign in to comment.