diff --git a/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java b/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java index 575f58308f03..c526047f2aee 100644 --- a/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java +++ b/platform/projectModel-impl/src/com/intellij/openapi/module/impl/ModuleManagerImpl.java @@ -17,8 +17,10 @@ package com.intellij.openapi.module.impl; import com.intellij.ProjectTopics; +import com.intellij.openapi.application.AccessToken; import com.intellij.openapi.application.ApplicationManager; import com.intellij.openapi.application.ModalityState; +import com.intellij.openapi.application.WriteAction; import com.intellij.openapi.components.PersistentStateComponent; import com.intellij.openapi.components.ProjectComponent; import com.intellij.openapi.diagnostic.Logger; @@ -179,7 +181,13 @@ public abstract class ModuleManagerImpl extends ModuleManager implements Project loadModules((ModuleModelImpl)model); - model.commit(); + AccessToken token = WriteAction.start(); + try { + model.commit(); + } + finally { + token.finish(); + } } }