From 40430409f5f62fe10de79cc133e076c4d9b0e8eb Mon Sep 17 00:00:00 2001
From: Wolfgang Thaller <wolfgang.thaller@gmx.net>
Date: Fri, 27 Apr 2018 08:58:19 +0200
Subject: [PATCH] LaunchAPPLServer: don't need separate code for Sys 6
 MultiFinder and single-process Finder

---
 LaunchAPPL/Server/AppLauncher.cc | 36 ++------------------------------
 1 file changed, 2 insertions(+), 34 deletions(-)

diff --git a/LaunchAPPL/Server/AppLauncher.cc b/LaunchAPPL/Server/AppLauncher.cc
index c593d11ad5..bd35d01926 100644
--- a/LaunchAPPL/Server/AppLauncher.cc
+++ b/LaunchAPPL/Server/AppLauncher.cc
@@ -4,32 +4,6 @@
 #include <TextUtils.h>
 #include <string.h>
 
-class AppLauncherSingle : public AppLauncher
-{
-public:
-    virtual bool Launch(ConstStr255Param name)
-    {
-        LaunchParamBlockRec lpb;
-        memset(&lpb, 0, sizeof(lpb));
-
-        lpb.reserved1 = (unsigned long) name;
-        lpb.reserved2 = 0;
-        lpb.launchBlockID = extendedBlock;
-        lpb.launchEPBLength = 6;
-        lpb.launchFileFlags = 0;
-        lpb.launchControlFlags = 0xC000;
-        
-        LaunchApplication(&lpb);
-
-        return false;
-    }
-
-    virtual bool IsRunning(ConstStr255Param name)
-    {
-        return false;
-    }
-};
-
 class AppLauncher7 : public AppLauncher
 {
     ProcessSerialNumber psn;
@@ -62,7 +36,7 @@ public:
     }
 };
 
-class AppLauncherMultiFinder : public AppLauncher
+class AppLauncher6 : public AppLauncher
 {
 public:
     virtual bool Launch(ConstStr255Param name)
@@ -111,12 +85,6 @@ std::unique_ptr<AppLauncher> CreateAppLauncher()
     if(environ.systemVersion >= 0x0700)
         return std::make_unique<AppLauncher7>();
     else 
-    {
-        uint32_t& Twitcher2 = *(uint32_t*) 0xB7C;
-        if(Twitcher2 == 0 || Twitcher2 == 0xFFFFFFFF)
-            return std::make_unique<AppLauncherSingle>();
-        else
-            return std::make_unique<AppLauncherMultiFinder>();
-    }
+        return std::make_unique<AppLauncher6>();
 #endif
 }