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

Jump to bottom

デバッグ実行時に外部コマンド実行ダイアログを開くとwarning_point関数で止まる問題を修正する #1440

Merged
merged 2 commits into from
Oct 28, 2020
Merged

デバッグ実行時に外部コマンド実行ダイアログを開くとwarning_point関数で止まる問題を修正する #1440

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dcb41cb
デバッグ実行時に外部コマンド実行ダイアログを開くとwarning_point関数で止まる問題を修正する
suconbu Oct 26, 2020
203f7be
レビュー指摘対応
suconbu Oct 27, 2020
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
27 changes: 16 additions & 11 deletions sakura_core/dlg/CDlgExec.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,24 +134,29 @@ void CDlgExec::SetData( void )
/*****************************
* データ設定 *
*****************************/
wcscpy( m_szCommand, m_pShareData->m_sHistory.m_aCommands[0] );
berryzplus marked this conversation as resolved.
Show resolved Hide resolved
hwndCombo = GetItemHwnd( IDC_COMBO_m_szCommand );
Combo_ResetContent( hwndCombo );
::DlgItem_SetText( GetHwnd(), IDC_COMBO_TEXT, m_szCommand );
int nSize = m_pShareData->m_sHistory.m_aCommands.size();
for( i = 0; i < nSize; ++i ){
Combo_AddString( hwndCombo, m_pShareData->m_sHistory.m_aCommands[i] );
const int nCommandsCount = m_pShareData->m_sHistory.m_aCommands.size();
if( 0 < nCommandsCount ){
wcscpy( m_szCommand, m_pShareData->m_sHistory.m_aCommands[0] );
::DlgItem_SetText( GetHwnd(), IDC_COMBO_TEXT, m_szCommand );
for( i = 0; i < nCommandsCount; ++i ){
Combo_AddString( hwndCombo, m_pShareData->m_sHistory.m_aCommands[i] );
}
Combo_SetCurSel( hwndCombo, 0 );
}
Combo_SetCurSel( hwndCombo, 0 );

wcscpy( m_szCurDir, m_pShareData->m_sHistory.m_aCurDirs[0] );
hwndCombo = GetItemHwnd( IDC_COMBO_CUR_DIR );
Combo_ResetContent( hwndCombo );
::DlgItem_SetText( GetHwnd(), IDC_COMBO_TEXT, m_szCurDir );
for( i = 0; i < m_pShareData->m_sHistory.m_aCurDirs.size(); ++i ){
Combo_AddString( hwndCombo, m_pShareData->m_sHistory.m_aCurDirs[i] );
const int nCurDirsCount = m_pShareData->m_sHistory.m_aCurDirs.size();
if( 0 < nCurDirsCount ){
wcscpy( m_szCurDir, m_pShareData->m_sHistory.m_aCurDirs[0] );
::DlgItem_SetText( GetHwnd(), IDC_COMBO_TEXT, m_szCurDir );
for( i = 0; i < nCurDirsCount; ++i ){
Combo_AddString( hwndCombo, m_pShareData->m_sHistory.m_aCurDirs[i] );
}
Combo_SetCurSel( hwndCombo, 0 );
}
Combo_SetCurSel( hwndCombo, 0 );

int nOpt;
hwndCombo = GetItemHwnd( IDC_COMBO_CODE_GET );
Expand Down