MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEADEV-41474: Exception when ignoring to move a file to another changelist

Browse Source
This commit is contained in:
Dmitry Avdeev
2009-12-01 14:20:03 +03:00
parent 9dc22395e6
commit 73a3f146eb
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/conflicts/ChangelistConflictAccessProvider.java
+3
View File
@@ -15,6 +15,7 @@
*/
package com.intellij.openapi.vcs.changes.conflicts;
import com.intellij.ide.IdeEventQueue;
import com.intellij.openapi.project.Project;
import com.intellij.openapi.vcs.changes.Change;
import com.intellij.openapi.vcs.changes.ChangeList;
@@ -63,10 +64,12 @@ public class ChangelistConflictAccessProvider implements WritingAccessProvider {
}
ChangelistConflictDialog dialog;
final int savedEventCount = IdeEventQueue.getInstance().getEventCount();
do {
dialog = new ChangelistConflictDialog(myProject, new ArrayList<ChangeList>(changeLists), denied);
dialog.show();
} while (dialog.isOK() && !dialog.getResolution().resolveConflict(myProject, changes));
IdeEventQueue.getInstance().setEventCount(savedEventCount);
if (dialog.isOK()) {
options.LAST_RESOLUTION = dialog.getResolution();