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

[patch]: stop spinner in case of error or exception

Browse Source
This commit is contained in:
Nadya Zabrodina
2016-04-29 15:09:11 +03:00
parent 204afe9ca2
commit a16ff35529
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/vcs-impl/src/com/intellij/openapi/vcs/changes/patch/ApplyPatchDifferentiatedDialog.java
+1 -3
View File
@@ -358,9 +358,7 @@ public class ApplyPatchDifferentiatedDialog extends DialogWrapper {
}
final PatchReader patchReader = loadPatches(file);
if (patchReader == null) return;
List<FilePatch> filePatches = ContainerUtil.newArrayList(patchReader.getPatches());
List<FilePatch> filePatches = patchReader != null ? ContainerUtil.newArrayList(patchReader.getPatches()) : Collections.emptyList();
if (!ContainerUtil.isEmpty(myBinaryShelvedPatches)) {
filePatches.addAll(myBinaryShelvedPatches);
}