From 8137bea8f863a1e88908908f4c22e0674b781861 Mon Sep 17 00:00:00 2001
From: rdb <git@rdb.name>
Date: Sun, 5 Jan 2020 18:52:26 +0100
Subject: [PATCH] makepackage: fix regression in MakeInstaller on Windows

---
 makepanda/makepackage.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/makepanda/makepackage.py b/makepanda/makepackage.py
index a12c493aa3..ec78a5277e 100755
--- a/makepanda/makepackage.py
+++ b/makepanda/makepackage.py
@@ -1074,12 +1074,11 @@ def MakeInstallerAndroid(version, **kwargs):
 def MakeInstaller(version, **kwargs):
     target = GetTarget()
     if target == 'windows':
-        if kwargs.get('installdir') is None:
+        dir = kwargs.pop('installdir', None)
+        if dir is None:
             dir = "C:\\Panda3D-" + version
             if GetTargetArch() == 'x64':
                 dir += '-x64'
-        else:
-            dir = kwargs['installdir']
 
         fn = "Panda3D-"