diff options
Diffstat (limited to 'platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java')
-rw-r--r-- | platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java index e3a36a2e59ab..a8eca00b505e 100644 --- a/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java +++ b/platform/platform-impl/src/com/intellij/openapi/application/impl/ApplicationImpl.java @@ -531,10 +531,10 @@ public class ApplicationImpl extends PlatformComponentManagerImpl implements App @Override public void load(@Nullable String optionsPath) throws IOException { - load(PathManager.getConfigPath(), optionsPath); + load(PathManager.getConfigPath(), optionsPath == null ? PathManager.getOptionsPath() : optionsPath); } - public void load(@NotNull String configPath, @Nullable String optionsPath) throws IOException { + public void load(@NotNull String configPath, @NotNull String optionsPath) throws IOException { getStateStore().setOptionsPath(optionsPath); getStateStore().setConfigPath(configPath); |