Tera TermRevision: 9105
https://osdn.net/projects/ttssh2/scm/svn/commits/9105
Author: zmatsuo
Date: 2020-12-20 21:16:38 +0900 (Sun, 20 Dec 2020)
Log Message:
-----------
filesys.cpp で定義しているグローバル変数 FSend をファイル内変数へ変更
- FileSnedIsSending() を追加
- filesys_proto.cpp から利用
Modified Paths:
--------------
trunk/teraterm/teraterm/filesys.cpp
trunk/teraterm/teraterm/filesys.h
trunk/teraterm/teraterm/filesys_proto.cpp
-------------- next part --------------
Modified: trunk/teraterm/teraterm/filesys.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys.cpp 2020-12-20 12:16:27 UTC (rev 9104)
+++ trunk/teraterm/teraterm/filesys.cpp 2020-12-20 12:16:38 UTC (rev 9105)
@@ -90,7 +90,7 @@
static char BracketStartStr[] = "\033[200~";
static char BracketEndStr[] = "\033[201~";
-BOOL FSend = FALSE;
+static BOOL FSend = FALSE;
static PFileTransDlg SendDlg = NULL;
@@ -604,3 +604,11 @@
{
return SendVar == NULL;
}
+
+/**
+ * TODO: IsSendVarNULL() \x82Ƃ̈Ⴂ\x82\xCD?
+ */
+BOOL FileSnedIsSending(void)
+{
+ return FSend;
+}
Modified: trunk/teraterm/teraterm/filesys.h
===================================================================
--- trunk/teraterm/teraterm/filesys.h 2020-12-20 12:16:27 UTC (rev 9104)
+++ trunk/teraterm/teraterm/filesys.h 2020-12-20 12:16:38 UTC (rev 9105)
@@ -36,7 +36,7 @@
// filesys.cpp
BOOL IsSendVarNULL(void);
-
+BOOL FileSnedIsSending(void);
BOOL FileSendStart(const wchar_t *filename, int binary);
void FileSend(void);
void FileSendEnd(void);
Modified: trunk/teraterm/teraterm/filesys_proto.cpp
===================================================================
--- trunk/teraterm/teraterm/filesys_proto.cpp 2020-12-20 12:16:27 UTC (rev 9104)
+++ trunk/teraterm/teraterm/filesys_proto.cpp 2020-12-20 12:16:38 UTC (rev 9105)
@@ -98,9 +98,6 @@
static PFileVarProto FileVar = NULL;
static int ProtoId;
-
-extern BOOL FSend;
-
static PProtoDlg PtDlg = NULL;
static BOOL cv_ProtoFlag = FALSE;
@@ -365,8 +362,8 @@
{
if (cv_ProtoFlag)
return FALSE;
- if (FSend)
- {
+ if (FileSnedIsSending())
+ { // \x83t\x83@\x83C\x83\x8B\x91\x97\x90M\x92\x86
FreeFileVar_(&FileVar);
return FALSE;
}