X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Ffmsapp.cpp;h=ebebe4a8fa194e40c74bad2374363757efd97fd7;hb=cd75427de26fc2ebc9baad558b1c0a081faa3b43;hp=318244382475fd013734060e7e85f9eec3d77910;hpb=cd97061e86eeecf5b77dea35f0549e73a50eb200;p=fms.git

diff --git a/src/fmsapp.cpp b/src/fmsapp.cpp
index 3182443..ebebe4a 100644
--- a/src/fmsapp.cpp
+++ b/src/fmsapp.cpp
@@ -17,6 +17,8 @@
 #include <Poco/FormattingChannel.h>
 #include <Poco/PatternFormatter.h>
 #include <iostream>
+#include <string>
+#include <cstring>
 
 #ifdef _WIN32
 	#include <direct.h>
@@ -24,9 +26,17 @@
 	#include <unistd.h>
 #endif
 
-FMSApp::FMSApp():m_displayhelp(false),m_showoptions(false),m_setoption(false),m_logtype("file")
+FMSApp::FMSApp():m_displayhelp(false),m_showoptions(false),m_setoption(false),m_logtype("file"),m_workingdirectory("")
 {
-
+	// get current working dir so we can go to it later
+	char wd[1024];
+	char *wdptr=NULL;
+	memset(wd,0,1024);
+	wdptr=getcwd(wd,1023);
+	if(wdptr)
+	{
+		m_workingdirectory=wdptr;
+	}
 }
 
 void FMSApp::defineOptions(Poco::Util::OptionSet &options)
@@ -90,8 +100,13 @@ void FMSApp::initialize(Poco::Util::Application &self)
 {
 	ServerApplication::initialize(self);
 
-	// set working directory to program directory
-	int rval=chdir(config().getString("application.dir").c_str());
+	// set working directory - fall back on application.dir if working directory isn't set
+	// if we are runing as a service, then working directory needs to be set to the application directory
+	if(m_workingdirectory=="" || config().getBool("application.runAsService",false)==true)
+	{
+		m_workingdirectory=config().getString("application.dir");
+	}
+	int rval=chdir(m_workingdirectory.c_str());
 
 	SetupDB();
 	SetupDefaultOptions();
@@ -145,8 +160,7 @@ int FMSApp::main(const std::vector<std::string> &args)
 
 	// running as a daemon would reset the working directory to / before calling main
 	// so we need to set the working directory again
-	// set working directory to program directory
-	int rval=chdir(config().getString("application.dir").c_str());
+	int rval=chdir(m_workingdirectory.c_str());
 
 	if(m_displayhelp)
 	{