DIvan2000/ReplayModCinematic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Ensure task queue is not locked during rendering (fixes #157)

Browse Source 
Similar to 3fedc22 in effect and cause. However tasks are executed, they just
cannot be submitted pre-1.14 because MC would continuously hold the lock on the
scheduledTasks queue for the entire renderVideo call.
This commit is contained in:
Jonas Herzig
2020-05-07 13:42:06 +02:00
parent 316f4e2c3c
commit 72ce522813
3 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/replaymod/render/gui/GuiRenderQueue.java
View File

@@ -197,7 +197,7 @@ public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> {
renderButton.onClick(() -> {
LOGGER.trace("Render button clicked");
ReplayMod.instance.runLater(() -> processQueue(queue));
ReplayMod.instance.runLaterWithoutLock(() -> processQueue(queue));
});
updateButtons();
@@ -233,7 +233,7 @@ public class GuiRenderQueue extends AbstractGuiPopup<GuiRenderQueue> {
// Update current job with fixed ffmpeg arguments
renderJob.setSettings(newSettings);
// Restart queue, skipping the already completed jobs
processQueue(Iterables.skip(queue, jobsToSkip));
ReplayMod.instance.runLaterWithoutLock(() -> processQueue(Iterables.skip(queue, jobsToSkip)));
});
return;
} catch (Throwable t) {

2
src/main/java/com/replaymod/render/gui/GuiRenderSettings.java
View File

@@ -229,7 +229,7 @@ public class GuiRenderSettings extends GuiScreen implements Closeable {
new GuiRenderQueue(GuiRenderSettings.this, GuiRenderSettings.this, replayHandler, timeline).open();
}
}).setSize(100, 20).setI18nLabel("replaymod.gui.renderqueue.open");
public final GuiButton renderButton = new GuiButton(buttonPanel).onClick(() -> ReplayMod.instance.runLater(new Runnable() {
public final GuiButton renderButton = new GuiButton(buttonPanel).onClick(() -> ReplayMod.instance.runLaterWithoutLock(new Runnable() {
@Override
public void run() {
// Closing this GUI ensures that settings are saved