Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

外部コマンド実行でキャンセルした時のメッセージが異なる問題を修正 #1721

Merged
merged 3 commits into from
Sep 20, 2021
Merged

外部コマンド実行でキャンセルした時のメッセージが異なる問題を修正 #1721

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
242f785
外部コマンド実行でキャンセルした時のメッセージが異なる問題を修正
beru Aug 29, 2021
d0d63b7
レビュー指摘対応
beru Aug 29, 2021
634008b
レビュー指摘に対応
beru Sep 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sakura_core/view/CEditView_ExecCmd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@ bool CEditView::ExecCmd( const WCHAR* pszCmd, int nFlgOpt, const WCHAR* pszCurDi
if( bCancelEnd && bOutputExtInfo ){
// 2006.12.03 maru アウトプットウィンドウにのみ出力
//最後にテキストを追加
oa.OutputW( LS(STR_EDITVIEW_EXECCMD_STOP) );
oa.OutputW( CLoadString().LoadStringW(STR_EDITVIEW_EXECCMD_STOP) );
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CSelectLang.h/cppのコード上のメソッド名定義はLoadStringですね。
WIN32APIのマクロによりLoadStringWに置換されるのだと思いますが、サクラ上の定義とは食い違います。
たぶんここはWなしのLoadStringのほうにしたほうがいいと思います。

Copy link
Contributor Author

@beru beru Aug 29, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

指摘ありがとうございます。 d0d63b7 で修正しました。

}

{
Expand Down