Merge remote-tracking branch 'origin/master'
authorDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 17 Nov 2016 14:50:47 +0000 (15:50 +0100)
committerDmitry Trofimov <dmitry.trofimov@jetbrains.com>
Thu, 17 Nov 2016 14:50:47 +0000 (15:50 +0100)
plugins/terminal/src/org/jetbrains/plugins/terminal/TerminalProjectOptionsProvider.kt

index 1e9ca678be603d4cd7434ef4a5568156eba1157c..2ca6168dcd5ecf362030daac79400fc0f60bf82b 100644 (file)
@@ -68,7 +68,7 @@ class TerminalProjectOptionsProvider(private val myProject: Project) : Persisten
         }
       }
 
-      return currentProjectFolder()
+      return directory ?: currentProjectFolder()
     }