Merge dcb41cb into d0a92d0

sakura-editor · Oct 26, 2020 · 0e63b6c · 0e63b6c
2 parents d0a92d0 + dcb41cb
commit 0e63b6c
Showing 1 changed file with 20 additions and 15 deletions.
diff --git a/sakura_core/dlg/CDlgExec.cpp b/sakura_core/dlg/CDlgExec.cpp
@@ -134,24 +134,29 @@ void CDlgExec::SetData( void )
  /*****************************
  * データ設定 *
  *****************************/
- wcscpy( m_szCommand, m_pShareData->m_sHistory.m_aCommands[0] );
- 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] );
+ int nCommandsCount = m_pShareData->m_sHistory.m_aCommands.size();
+ if( 0 < nCommandsCount ){
+ wcscpy( m_szCommand, m_pShareData->m_sHistory.m_aCommands[0] );
+ hwndCombo = GetItemHwnd( IDC_COMBO_m_szCommand );
+ Combo_ResetContent( hwndCombo );
+ ::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] );
+ int nCurDirsCount = m_pShareData->m_sHistory.m_aCurDirs.size();
+ if( 0 < nCurDirsCount ){
+ 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 < 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 );