From 106435e579e19a93a03c4c8ae0811098949496a3 Mon Sep 17 00:00:00 2001
From: George Bateman <george.bateman16@gmail.com>
Date: Fri, 25 Aug 2017 21:09:12 +0100
Subject: [PATCH] Unlock "Create Movie" in Movie Maker after use

Fixes #5168.
---
 .../MovieMaker/src/processing/app/tools/MovieMaker.java     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMaker.java b/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMaker.java
index 44abc680b..bbfd28abf 100644
--- a/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMaker.java
+++ b/build/shared/tools/MovieMaker/src/processing/app/tools/MovieMaker.java
@@ -606,12 +606,14 @@ public class MovieMaker extends JFrame implements Tool {
         } catch (Exception ex) {
           t = ex;
         }
-        t.printStackTrace();
-        JOptionPane.showMessageDialog(MovieMaker.this,
+        if (t != null) {
+          t.printStackTrace();
+          JOptionPane.showMessageDialog(MovieMaker.this,
                                       Language.text("movie_maker.error.movie_failed") + "\n" +
                                       (t.getMessage() == null ? t.toString() : t.getMessage()),
                                       Language.text("movie_maker.error.sorry"),
                                       JOptionPane.ERROR_MESSAGE);
+        }
         createMovieButton.setEnabled(true);
       }
     }.execute();