Browse Source

#IQRV #comment 用户目录获取调整

80374374 10 months ago
parent
commit
a513889c8b

+ 3 - 6
Module/mod_ResourceWatcher/ResourceWatcherFSM.cpp

@@ -57,8 +57,6 @@
 #pragma comment(lib, "wlanapi.lib")
 #endif
 
-#include "JsonConvertHelper.hpp"
-
 //硬件信息搜集参数  
 #define DEFAULT_HARDWARE_CHECK_TIME 60 * 1000 //CPU、内存扫描默认间隔,1分钟
 #define TIMER_HARDWARE_CHECK 2
@@ -202,7 +200,7 @@ ResourceWatcherFSM::ResourceWatcherFSM(void)
     :m_strTerminalNo(true),
     m_bFirstRunAfterBoot(FALSE),
     m_cpuTop(0), flag4DeleteKeyAutoStartFile(false), flag4DoAutoStartTaskIgnoreBoot(FALSE), m_skipDesktopDetect(FALSE)
-    , m_strCurrentUserName(true), m_strLoginedUserName(true), m_strCurrentUserNameBakup(true)
+    , m_strCurrentUserName(true), m_strLoginedUserName(true)
 {
 #ifdef RVC_OS_WIN
     m_iNonSignedTotal = 0;
@@ -480,7 +478,6 @@ void ResourceWatcherFSM::AfterInit()
 {
 #if defined(RVC_OS_WIN)
     InitUserInfo();
-    flag4DoAutoStartTaskIgnoreBoot = TRUE;
     if (m_bFirstRunAfterBoot) {
         InitCustomAutoStartFileSheet();
         AggerateAutoStatTask* task = new AggerateAutoStatTask(this);
@@ -2602,13 +2599,13 @@ void ResourceWatcherFSM::DetectAutoStartFileAndWarn()
     struct fileStruc {
         std::string username;
         std::vector<std::string> filenames;
-        JSONCONVERT2OBJECT_MEMEBER_REGISTER(username, filenames)
+        //JSONCONVERT2OBJECT_MEMEBER_REGISTER(username, filenames)
     };
 
     struct fileVec
     {
         std::vector<fileStruc> startupfiles;
-        JSONCONVERT2OBJECT_MEMEBER_REGISTER(startupfiles)
+        //JSONCONVERT2OBJECT_MEMEBER_REGISTER(startupfiles)
     } curStartupFileInfo, keyStartFileInfo;
 
 	CSimpleStringA desktopParentPath = "C:\\Users";

+ 0 - 2
Module/mod_ResourceWatcher/ResourceWatcherFSM.h

@@ -250,8 +250,6 @@ private:
 
 	CSimpleStringA m_strCurrentUserName;
 	CSimpleStringA m_strLoginedUserName;
-	CSimpleStringA m_strCurrentUserNameBakup;
-
 
 public:
 	void CheckDiskFileSpace();