avoid blocking lock when switching AsciiDoc editor when trying to sav…

…e contents of changed documents (#520)
asciidoctor · Jul 9, 2020 · 3bc0a6e · 3bc0a6e
1 parent 0daac52
commit 3bc0a6e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/main/java/org/asciidoc/intellij/editor/AsciiDocPreviewEditor.java b/src/main/java/org/asciidoc/intellij/editor/AsciiDocPreviewEditor.java
@@ -421,22 +421,22 @@ public void selectNotify() {
               ApplicationManager.getApplication().runWriteAction(() -> {
                 // project might be already closed (yes, this really happens when you work in multiple projects opened in separate windows)
                 if (!project.isDisposed()) {
-                  currentContent = null; // force a refresh of the preview by resetting the current memorized content
                   // save the content in all other editors as their content might be referenced in preview
                   // don't use ApplicationManager.getApplication().saveAll() as it will save in the background and will save settings as well
                   for (Document unsavedDocument : FileDocumentManager.getInstance().getUnsavedDocuments()) {
                     FileDocumentManager.getInstance().saveDocument(unsavedDocument);
                   }
                   reprocessAnnotations();
+                  currentContent = null; // force a refresh of the preview by resetting the current memorized content
                   renderIfVisible();
                 }
               });
             } finally {
               SAVE_ALL_LOCK.unlock();
             }
           } else {
-            currentContent = null; // force a refresh of the preview by resetting the current memorized content
             reprocessAnnotations();
+            currentContent = null; // force a refresh of the preview by resetting the current memorized content
             renderIfVisible();
             log.warn("unable to acquire lock for save-all-docs");
           }
@@ -446,8 +446,8 @@ public void selectNotify() {
       });
     } else {
       if (!project.isDisposed()) {
-        currentContent = null; // force a refresh of the preview by resetting the current memorized content
         reprocessAnnotations();
+        currentContent = null; // force a refresh of the preview by resetting the current memorized content
         renderIfVisible();
       }
     }