From 4c5d8c2ede6bfc928acc95e0afc31346177c3be8 Mon Sep 17 00:00:00 2001 From: electron128 Date: Wed, 29 Apr 2015 17:45:33 +0000 Subject: [PATCH] use same docroot in retroshare-nogui as in retroshare-gui git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8188 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- retroshare-nogui/src/retroshare.cc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/retroshare-nogui/src/retroshare.cc b/retroshare-nogui/src/retroshare.cc index 5b79c4b0e..f7a19306f 100644 --- a/retroshare-nogui/src/retroshare.cc +++ b/retroshare-nogui/src/retroshare.cc @@ -75,7 +75,7 @@ int main(int argc, char **argv) { #ifdef ENABLE_WEBUI - std::string docroot = "./"; + std::string docroot = ""; uint16_t httpPort = 0; std::string listenAddress; bool allowAllIps = false; @@ -93,6 +93,9 @@ int main(int argc, char **argv) std::cerr << args.usage() << std::endl; } + if(docroot.empty()) + docroot = resource_api::getDefaultDocroot(); + resource_api::ApiServer api; resource_api::RsControlModule ctrl_mod(argc, argv, api.getStateTokenServer(), &api, true); api.addResourceHandler("control", dynamic_cast(&ctrl_mod), &resource_api::RsControlModule::handleRequest);