From bb9e2ef56537334737f618cf5c06e64b62e24a6a Mon Sep 17 00:00:00 2001
From: Marco Batzinger <mba@amagno.de>
Date: Wed, 24 Mar 2021 10:03:38 +0100
Subject: [PATCH] check for ghostscript sub key; added more logging

---
 .../Misc/VirtualTcpInputPrinter.cs                    |  3 +++
 .../AmagnoVirtualPrinter.WixSharpInstaller/Script.cs  | 11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/Common/AmagnoVirtualPrinter.Agent.Lib/Misc/VirtualTcpInputPrinter.cs b/Common/AmagnoVirtualPrinter.Agent.Lib/Misc/VirtualTcpInputPrinter.cs
index 3ba7a00..b3d28c3 100644
--- a/Common/AmagnoVirtualPrinter.Agent.Lib/Misc/VirtualTcpInputPrinter.cs
+++ b/Common/AmagnoVirtualPrinter.Agent.Lib/Misc/VirtualTcpInputPrinter.cs
@@ -124,6 +124,7 @@ namespace AmagnoVirtualPrinter.Agent.Lib.Misc
 
                 if (!isJobValid)
                 {
+                    LogDebug("Job is not valid.");
                     return;
                 }
 
@@ -131,12 +132,14 @@ namespace AmagnoVirtualPrinter.Agent.Lib.Misc
             }
             if (status == PrintStatus.Canceled)
             {
+                LogDebug($"Deleting file on print status: {status}");
                 DeleteFiles(ini, dir, rawFile);
             }
 
             var jobStatus = _jobService.ReadJobStatus(ini);
             if (jobStatus == JobStatus.Completed || jobStatus == JobStatus.Failed)
             {
+                LogDebug($"Deleting file on job status: {jobStatus}");
                 DeleteFiles(ini, dir, rawFile);
             }
         }
diff --git a/Installer/AmagnoVirtualPrinter.WixSharpInstaller/Script.cs b/Installer/AmagnoVirtualPrinter.WixSharpInstaller/Script.cs
index 9341826..45cd550 100644
--- a/Installer/AmagnoVirtualPrinter.WixSharpInstaller/Script.cs
+++ b/Installer/AmagnoVirtualPrinter.WixSharpInstaller/Script.cs
@@ -89,7 +89,7 @@ namespace AmagnoVirtualPrinter.WixSharpInstaller
 
             var gsKey = RegistryKey
                 .OpenBaseKey(Microsoft.Win32.RegistryHive.LocalMachine, registryView)
-                .OpenSubKey(@"SOFTWARE\GPL Ghostscript\9.52");
+                .OpenSubKey(@"SOFTWARE\GPL Ghostscript");
 
             if (gsKey == null)
             {
@@ -98,6 +98,15 @@ namespace AmagnoVirtualPrinter.WixSharpInstaller
                 return;
             }
 
+            var subKeyNames = gsKey.GetSubKeyNames();
+            gsKey = gsKey.OpenSubKey(subKeyNames[0]);
+            if (gsKey == null)
+            {
+                MessageBox.Show(gsNotFound);
+                e.Result = ActionResult.Failure;
+                return;
+            }
+
             var gsAssembly = (string)gsKey.GetValue("GS_DLL");
 
             if (System.IO.File.Exists(gsAssembly))