Tera TermRevision: 8356
https://osdn.net/projects/ttssh2/scm/svn/commits/8356
Author: zmatsuo
Date: 2019-11-03 00:35:11 +0900 (Sun, 03 Nov 2019)
Log Message:
-----------
送信ディレイのテストコード無効化、クリップボードからの送信時送信ダイアログをださない
Modified Paths:
--------------
branches/unicode_buf/teraterm/teraterm/clipboar.c
branches/unicode_buf/teraterm/teraterm/sendmem.cpp
branches/unicode_buf/teraterm/teraterm/vtwin.cpp
-------------- next part --------------
Modified: branches/unicode_buf/teraterm/teraterm/clipboar.c
===================================================================
--- branches/unicode_buf/teraterm/teraterm/clipboar.c 2019-11-02 14:49:42 UTC (rev 8355)
+++ branches/unicode_buf/teraterm/teraterm/clipboar.c 2019-11-02 15:35:11 UTC (rev 8356)
@@ -818,10 +818,12 @@
if (sm == NULL)
return;
// SendMemInitDelay(sm, 0, 1000);
- SendMemInitDelay(sm, 1000, 0);
+// SendMemInitDelay(sm, 1000, 0);
+#if 0
SendMemInitDialog(sm, hInst, HVTWin, ts.UILanguageFile);
SendMemInitDialogCaption(sm, L"from clipboard");
SendMemInitDialogFilename(sm, L"Clipboard");
+#endif
SendMemStart(sm);
}
#endif
Modified: branches/unicode_buf/teraterm/teraterm/sendmem.cpp
===================================================================
--- branches/unicode_buf/teraterm/teraterm/sendmem.cpp 2019-11-02 14:49:42 UTC (rev 8355)
+++ branches/unicode_buf/teraterm/teraterm/sendmem.cpp 2019-11-02 15:35:11 UTC (rev 8356)
@@ -107,9 +107,11 @@
p->send_ptr = NULL;
TalkStatus = IdTalkKeyb;
- p->dlg->Destroy();
- delete p->dlg;
- delete p->dlg_observer;
+ if (p->dlg != NULL) {
+ p->dlg->Destroy();
+ delete p->dlg;
+ delete p->dlg_observer;
+ }
free(p->UILanguageFile);
free(p->dialog_caption);
free(p->filename);
@@ -315,7 +317,9 @@
}
// \x83_\x83C\x83A\x83\x8D\x83O\x8DX\x90V
- p->dlg->RefreshNum(p->send_index, p->send_len);
+ if (p->dlg != NULL) {
+ p->dlg->RefreshNum(p->send_index, p->send_len);
+ }
if (need_delay) {
// wait\x82ɓ\xFC\x82\xE9
Modified: branches/unicode_buf/teraterm/teraterm/vtwin.cpp
===================================================================
--- branches/unicode_buf/teraterm/teraterm/vtwin.cpp 2019-11-02 14:49:42 UTC (rev 8355)
+++ branches/unicode_buf/teraterm/teraterm/vtwin.cpp 2019-11-02 15:35:11 UTC (rev 8356)
@@ -4264,7 +4264,7 @@
{
SendMem *sm = SendMemInit(str_ptr, str_len, SendMemTypeTextLF);
- SendMemInitDelay(sm, 10, 0);
+ //SendMemInitDelay(sm, 10, 0);
SendMemInitDialog(sm, hInst, HVTWin, ts.UILanguageFile);
SendMemInitDialogCaption(sm, L"send file");
wchar_t *file_name_w = ToWcharA(file_name);