revert last two commit

dev
Tom Early 2 weeks ago
parent 2917f114ea
commit bf6a2ae2bf

@ -78,12 +78,7 @@ bool CQnetConfigure::Initialize(const std::string &file)
std::string filename(CFG_DIR); std::string filename(CFG_DIR);
filename.append("/defaults"); filename.append("/defaults");
if (ReadConfigFile(filename.c_str(), defaults)) if (ReadConfigFile(filename.c_str(), defaults))
{ return true;
if (ReadConfigFile("./defaults", defaults))
return true;
else
printf("Successfully read ./defaults!]n");
}
return ReadConfigFile(file, cfg); return ReadConfigFile(file, cfg);
} }

@ -50,7 +50,7 @@
#include "QnetGateway.h" #include "QnetGateway.h"
#include "Utilities.h" #include "Utilities.h"
const std::string GW_VERSION("QnetGateway-60706"); const std::string GW_VERSION("QnetGateway-40411");
int CQnetGateway::FindIndex(const int i) const int CQnetGateway::FindIndex(const int i) const
{ {
@ -2561,12 +2561,7 @@ bool CQnetGateway::Initialize(const std::string &path)
std::string fname(CFG_DIR); std::string fname(CFG_DIR);
fname.append("/qn.db"); fname.append("/qn.db");
if (qnDB.Open(fname.c_str())) if (qnDB.Open(fname.c_str()))
{ return true;
if (qnDB.Open("./qn.db"))
return true;
else
printf("was able to open ./qn.db");
}
qnDB.ClearLH(); qnDB.ClearLH();
// Open unix sockets between qngateway and qnremote // Open unix sockets between qngateway and qnremote

Loading…
Cancel
Save

Powered by TurnKey Linux.