summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main.cpp5
-rw-r--r--src/mainwindow.cpp3
2 files changed, 3 insertions, 5 deletions
diff --git a/src/main.cpp b/src/main.cpp
index 8507d725..bc89375e 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -323,8 +323,6 @@ int main(int argc, char *argv[])
}
}
- application.setLibraryPaths(QStringList() << (application.applicationDirPath() + "/dlls"));
-
SetUnhandledExceptionFilter(MyUnhandledExceptionFilter);
if (!HaveWriteAccess(ToWString(application.applicationDirPath()))) {
@@ -351,6 +349,9 @@ int main(int argc, char *argv[])
splash.show();
{ // extend path to include dll directory so plugins don't need a manifest
+ // (using AddDllDirectory would be an alternative to this but it seems fairly complicated esp.
+ // since it isn't easily accessible on Windows < 8
+ // SetDllDirectory replaces other search directories and this seems to propagate to child processes)
static const int BUFSIZE = 4096;
boost::scoped_array<TCHAR> oldPath(new TCHAR[BUFSIZE]);
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 1c54d250..9b7def0f 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -319,9 +319,6 @@ MainWindow::MainWindow(const QString &exeName
m_Tutorial.expose("modList", m_OrganizerCore.modList());
m_Tutorial.expose("espList", m_OrganizerCore.pluginList());
- // before we start loading plugins we, add the dll path to the dll search order
- ::SetDllDirectoryW(ToWString(QDir::toNativeSeparators(qApp->applicationDirPath() + "/dlls")).c_str());
-
m_OrganizerCore.setUserInterface(this, this);
for (const QString &fileName : m_PluginContainer.pluginFileNames()) {
installTranslator(QFileInfo(fileName).baseName());