From d9e5fe3757a3283f08b351c4cb380a0242e366e3 Mon Sep 17 00:00:00 2001
From: Irina Chernushina <Irina.Chernushina@jetbrains.com>
Date: Wed, 16 Sep 2009 15:18:10 +0400
Subject: [PATCH] VCS: java.lang.AssertionError: Registering startup activity
 that will never be run (VcsManagerPerModuleConfiguration)

---
 .../openapi/vcs/impl/VcsManagerPerModuleConfiguration.java      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/openapi/vcs/impl/VcsManagerPerModuleConfiguration.java b/platform/lang-impl/src/com/intellij/openapi/vcs/impl/VcsManagerPerModuleConfiguration.java
index 0736f4cd473c..70fc402a7798 100644
--- a/platform/lang-impl/src/com/intellij/openapi/vcs/impl/VcsManagerPerModuleConfiguration.java
+++ b/platform/lang-impl/src/com/intellij/openapi/vcs/impl/VcsManagerPerModuleConfiguration.java
@@ -52,7 +52,7 @@ public class VcsManagerPerModuleConfiguration implements JDOMExternalizable, Mod
     if (!USE_PROJECT_VCS) {
       final VirtualFile[] roots = ModuleRootManager.getInstance(myModule).getContentRoots();
 
-      StartupManager.getInstance(myModule.getProject()).registerStartupActivity(new Runnable() {
+      StartupManager.getInstance(myModule.getProject()).runWhenProjectIsInitialized(new Runnable() {
         public void run() {
           for(VirtualFile file: roots) {
             vcsManager.setDirectoryMapping(file.getPath(), ACTIVE_VCS_NAME);