From 373d353d9fb9e90df7b6a2e3012d4ef56a5cdb92 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Mon, 14 Jan 2019 14:35:23 +0100 Subject: [PATCH] =?UTF-8?q?svn=20=E2=80=94=20fix=20"not=20allowed=20to=20s?= =?UTF-8?q?ubscribe=20to=20the=20same=20topic=20several=20times"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java index 4951fe831b2f..2f0b0a313831 100644 --- a/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java +++ b/plugins/svn4idea/src/org/jetbrains/idea/svn/SvnVcs.java @@ -301,7 +301,13 @@ public class SvnVcs extends AbstractVcs { MessageBusConnection busConnection = myProject.getMessageBus().connect(); if (!myProject.isDefault()) { ChangeListManager.getInstance(myProject).addChangeListListener(myChangeListListener); - busConnection.subscribe(ProjectLevelVcsManager.VCS_CONFIGURATION_CHANGED, myVcsListener); + busConnection.subscribe(ProjectLevelVcsManager.VCS_CONFIGURATION_CHANGED, new VcsListener() { + @Override + public void directoryMappingChanged() { + myVcsListener.directoryMappingChanged(); + myRootsToWorkingCopies.directoryMappingChanged(); + } + }); } SvnApplicationSettings.getInstance().svnActivated(); @@ -341,7 +347,10 @@ public class SvnVcs extends AbstractVcs { }, SvnBundle.message("refreshing.working.copies.roots.progress.text"), true, myProject);*/ }); - busConnection.subscribe(ProjectLevelVcsManager.VCS_CONFIGURATION_CHANGED, myRootsToWorkingCopies); + // not allowed to subscribe to the same topic several times, see subscribing above + if (myProject.isDefault()) { + busConnection.subscribe(ProjectLevelVcsManager.VCS_CONFIGURATION_CHANGED, myRootsToWorkingCopies); + } myLoadedBranchesStorage.activate(); }