From 898953fe78dc3639a1b1c44a848d35e83c6029d8 Mon Sep 17 00:00:00 2001 From: kusano Date: Wed, 23 Mar 2016 20:45:27 +0900 Subject: [PATCH] Add an empty directory stuff/toonzfarm, which is necessary for tfarmserver --- stuff/toonzfarm/.gitkeep | 0 toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp | 2 +- toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp | 2 +- 3 files changed, 2 insertions(+), 2 deletions(-) create mode 100644 stuff/toonzfarm/.gitkeep diff --git a/stuff/toonzfarm/.gitkeep b/stuff/toonzfarm/.gitkeep new file mode 100644 index 00000000..e69de29b diff --git a/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp b/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp index 9b5ec10d..5a9f70ff 100644 --- a/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp +++ b/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp @@ -2384,7 +2384,7 @@ void ControllerService::onStart(int argc, char *argv[]) TFilePath globalRoot = getGlobalRoot(); if (globalRoot.isEmpty()) { - QString errMsg("Unable to get TFARMGLOBALROOT environment variable\n"); + QString errMsg("Unable to get FARMROOT environment variable\n"); addToMessageLog(errMsg); // exit the program diff --git a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp index a8fa96d5..abbaedac 100644 --- a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp +++ b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp @@ -835,7 +835,7 @@ void FarmServerService::onStart(int argc, char *argv[]) if (!lRootDirExists) { string errMsg("Unable to start the Server"); errMsg += "\n"; - errMsg += "The directorya specified as Local Root does not exist"; + errMsg += "The directory specified as Local Root does not exist"; errMsg += "\n"; addToMessageLog(errMsg);