送信ディレイのテストコード無効化、クリップボードからの送信時送信ダイアログをださない
branches/unicode_buf/teraterm/teraterm/clipboar.c (diff)
branches/unicode_buf/teraterm/teraterm/sendmem.cpp (diff) branches/unicode_buf/teraterm/teraterm/vtwin.cpp (diff)| @@ -818,10 +818,12 @@ | ||
| 818 | 818 | if (sm == NULL) |
| 819 | 819 | return; |
| 820 | 820 | // SendMemInitDelay(sm, 0, 1000); |
| 821 | - SendMemInitDelay(sm, 1000, 0); | |
| 821 | +// SendMemInitDelay(sm, 1000, 0); | |
| 822 | +#if 0 | |
| 822 | 823 | SendMemInitDialog(sm, hInst, HVTWin, ts.UILanguageFile); |
| 823 | 824 | SendMemInitDialogCaption(sm, L"from clipboard"); |
| 824 | 825 | SendMemInitDialogFilename(sm, L"Clipboard"); |
| 826 | +#endif | |
| 825 | 827 | SendMemStart(sm); |
| 826 | 828 | } |
| 827 | 829 | #endif |
| @@ -107,9 +107,11 @@ | ||
| 107 | 107 | p->send_ptr = NULL; |
| 108 | 108 | |
| 109 | 109 | TalkStatus = IdTalkKeyb; |
| 110 | - p->dlg->Destroy(); | |
| 111 | - delete p->dlg; | |
| 112 | - delete p->dlg_observer; | |
| 110 | + if (p->dlg != NULL) { | |
| 111 | + p->dlg->Destroy(); | |
| 112 | + delete p->dlg; | |
| 113 | + delete p->dlg_observer; | |
| 114 | + } | |
| 113 | 115 | free(p->UILanguageFile); |
| 114 | 116 | free(p->dialog_caption); |
| 115 | 117 | free(p->filename); |
| @@ -315,7 +317,9 @@ | ||
| 315 | 317 | } |
| 316 | 318 | |
| 317 | 319 | // ダイアログ更新 |
| 318 | - p->dlg->RefreshNum(p->send_index, p->send_len); | |
| 320 | + if (p->dlg != NULL) { | |
| 321 | + p->dlg->RefreshNum(p->send_index, p->send_len); | |
| 322 | + } | |
| 319 | 323 | |
| 320 | 324 | if (need_delay) { |
| 321 | 325 | // waitに入る |
| @@ -4264,7 +4264,7 @@ | ||
| 4264 | 4264 | |
| 4265 | 4265 | { |
| 4266 | 4266 | SendMem *sm = SendMemInit(str_ptr, str_len, SendMemTypeTextLF); |
| 4267 | - SendMemInitDelay(sm, 10, 0); | |
| 4267 | + //SendMemInitDelay(sm, 10, 0); | |
| 4268 | 4268 | SendMemInitDialog(sm, hInst, HVTWin, ts.UILanguageFile); |
| 4269 | 4269 | SendMemInitDialogCaption(sm, L"send file"); |
| 4270 | 4270 | wchar_t *file_name_w = ToWcharA(file_name); |
Tera Term