diff --git a/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp b/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp index 8b20957..53ef038 100644 --- a/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp +++ b/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp @@ -105,8 +105,7 @@ TFilePath getLocalRoot() { TFilePath lroot; #ifdef _WIN32 -std: - string regpath = "SOFTWARE\\" + tver.getAppName() + "\\" + tver.getAppName() + + std::string regpath = "SOFTWARE\\" + tver.getAppName() + "\\" + tver.getAppName() + "\\" + tver.getAppVersionString() + "\\FARMROOT"; TFilePath name(regpath); lroot = TFilePath(TSystem::getSystemValue(name).toStdString()) + @@ -2251,8 +2250,7 @@ void ControllerService::onStart(int argc, char *argv[]) { TFilePath logFilePath = lRootDir + "controller.log"; m_userLog = new TUserLog(logFilePath); } -std: - string appverinfo = tver.getAppVersionInfo("Farm Controller") + "\n\n"; + std::string appverinfo = tver.getAppVersionInfo("Farm Controller") + "\n\n"; m_userLog->info(appverinfo.c_str()); TFilePath globalRoot = getGlobalRoot(); diff --git a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp index d5e1abd..d40e6c0 100644 --- a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp +++ b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp @@ -876,8 +876,7 @@ void FarmServerService::onStart(int argc, char *argv[]) { m_userLog = new TUserLog(logFilePath); } -std: - string appverinfo = tver.getAppVersionInfo("Farm Server") + "\n\n"; + std::string appverinfo = tver.getAppVersionInfo("Farm Server") + "\n\n"; m_userLog->info(appverinfo.c_str()); // legge dal file di configurazione dei server il numero di porta da