2 files changed, 7 insertions, 1 deletions
diff --git a/scriptingplugin.cpp b/scriptingplugin.cpp
index 9fa44e3..0f247cb 100644
--- a/scriptingplugin.cpp
+++ b/scriptingplugin.cpp
@@ -71,6 +71,12 @@ void ScriptingPlugin::extensionsInitialized()
 
 bool ScriptingPlugin::delayedInitialize()
 {
+    // Load init script
+    const QString initScript = m_scriptManager->defaultDirectory() + QLatin1String("/init.qs");
+    if ( QFile::exists(initScript) )
+        m_scriptManager->runFile(initScript);
+
+    // If a startup script is specified, load that.
     if ( m_startUpScript.isNull() )
         return false;
     if (!QFileInfo(m_startUpScript).exists())
diff --git a/scriptmanager.cpp b/scriptmanager.cpp
index 6a85ddb..7ffd31c 100644
--- a/scriptmanager.cpp
+++ b/scriptmanager.cpp
@@ -170,7 +170,7 @@ void ScriptManager::directoryChanged(const QString &path, bool initialize)
     foreach (const QString &fileName, files) {
         QFileInfo fi(fileName);
 
-        if (fi.isReadable()) {
+        if (fi.isReadable() && fi.fileName() != QLatin1String("init.qs")) {
             Script script;
             script.fileName = fileName;
             script.name = fi.baseName();