From c7860c2cb66f2752119a6557bd58a1c672b96716 Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Thu, 18 Aug 2016 16:48:55 +0200
Subject: [PATCH] Don't fail old service cleanup

---
 win/winvnc/winvnc.cxx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/win/winvnc/winvnc.cxx b/win/winvnc/winvnc.cxx
index 57f9f3d4..aa41bcbf 100644
--- a/win/winvnc/winvnc.cxx
+++ b/win/winvnc/winvnc.cxx
@@ -170,8 +170,16 @@ static void processParams(int argc, char** argv) {
         i = argc;
 
         // Try to clean up earlier services we've had
-        rfb::win32::unregisterService("WinVNC4");
-        rfb::win32::unregisterService("TigerVNC Server");
+        try {
+          rfb::win32::unregisterService("WinVNC4");
+        } catch (rdr::SystemException) {
+          // Do nothing as we might fail simply because there was no
+          // service to remove
+        }
+        try {
+          rfb::win32::unregisterService("TigerVNC Server");
+        } catch (rdr::SystemException) {
+        }
 
         if (rfb::win32::registerService(VNCServerService::Name,
                                         _T("TigerVNC Server"),
-- 
2.39.5