From 8e583f58be6434e7a7d007bc55b06036a2077bc6 Mon Sep 17 00:00:00 2001 From: thunder2 Date: Wed, 3 Nov 2010 01:33:49 +0000 Subject: [PATCH] Changed path for the DHT bootstrap file to RetroShare's exe dir for Windows. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3742 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/rsserver/rsinit.cc | 33 +++++++++++++++------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc index c25103b32..7f942eb3b 100644 --- a/libretroshare/src/rsserver/rsinit.cc +++ b/libretroshare/src/rsserver/rsinit.cc @@ -845,22 +845,25 @@ std::string RsInit::getRetroshareDataDirectory() #endif #else - if (RsInitConfig::portable) - { - /* For Windows Portable, files must be in the data directory */ - dataDirectory = "Data"; - std::cerr << "getRetroshareDataDirectory() WINDOWS PORTABLE: " << dataDirectory; - std::cerr << std::endl; - } - else - { - /* For Windows: environment variable APPDATA should be suitable */ - dataDirectory = getenv("APPDATA"); - dataDirectory += "\\RetroShare"; +// if (RsInitConfig::portable) +// { +// /* For Windows Portable, files must be in the data directory */ +// dataDirectory = "Data"; +// std::cerr << "getRetroshareDataDirectory() WINDOWS PORTABLE: " << dataDirectory; +// std::cerr << std::endl; +// } +// else +// { +// /* For Windows: environment variable APPDATA should be suitable */ +// dataDirectory = getenv("APPDATA"); +// dataDirectory += "\\RetroShare"; +// +// std::cerr << "getRetroshareDataDirectory() WINDOWS: " << dataDirectory; +// std::cerr << std::endl; +// } - std::cerr << "getRetroshareDataDirectory() WINDOWS: " << dataDirectory; - std::cerr << std::endl; - } + /* Use RetroShare's exe dir */ + dataDirectory = "."; #endif /******************************** WINDOWS/UNIX SPECIFIC PART ******************/