Merge with branch1.2

1 files changed, 1 insertions, 22 deletions

diff --git a/src/helper.cpp b/src/helper.cpp
index f47a468a..4c22dbda 100644
--- a/src/helper.cpp
+++ b/src/helper.cpp
@@ -31,7 +31,7 @@ along with Mod Organizer.  If not, see <http://www.gnu.org/licenses/>.
 namespace Helper {

 

 

-bool helperExec(LPCWSTR moDirectory, LPCWSTR commandLine)

+static bool helperExec(LPCWSTR moDirectory, LPCWSTR commandLine)

 {

   wchar_t fileName[MAX_PATH];

   _snwprintf(fileName, MAX_PATH, L"%ls\\helper.exe", moDirectory);

@@ -81,27 +81,6 @@ bool init(const std::wstring &moDirectory)
 }

 

 

-bool setNXMHandler(const std::wstring &moDirectory, bool enable)

-{

-  DWORD userNameLen = UNLEN + 1;

-  wchar_t userName[UNLEN + 1];

-

-  if (!GetUserName(userName, &userNameLen)) {

-    reportError(QObject::tr("failed to determine account name"));

-    return false;

-  }

-

-  wchar_t *commandLine = new wchar_t[32768];

-  _snwprintf(commandLine, 32768, L"handleNXM \"%ls\" %d",

-               moDirectory.c_str(), enable ? 1 : 0);

-

-  bool res = helperExec(moDirectory.c_str(), commandLine);

-  delete [] commandLine;

-

-  return res;

-}

-

-

 bool backdateBSAs(const std::wstring &moDirectory, const std::wstring &dataPath)

 {

   wchar_t *commandLine = new wchar_t[32768];