Bye Bye debugging!

git-svn-id: http://svn.dmdirc.com/trunk@4039 00569f92-eb28-0410-84fd-f71c24880f

installer/windows/Uninstaller.dpr

@@ -51,8 +51,6 @@ begin
 		sleep(1000);
 		GetExitCodeProcess(ProcessInfo.hProcess, Result);
 	end;
-	
-	MessageBox(0, PChar('Exec: '+sProgramToRun+#13#10+'Res: '+inttostr(Result)), 'DMDirc Uninstaller', MB_OK + MB_ICONEXCLAMATION);
 end;
 
 function KillDir(Dir: string): Integer;
@@ -94,77 +92,75 @@ var
 	profileDir: String;
 	deleteProtocol: boolean;
 begin
-	if MessageBox(0, PChar('This will uninstall DMDirc.'+#13#10+#13#10+'Do you want to continue?'), 'DMDirc Uninstaller', MB_YESNO) = IDYES then begin
-		if (ParamCount > 0) then begin
-			for i := 1 to ParamCount do begin
-				InstallDir := InstallDir+' '+paramstr(i);
-			end;
-			InstallDir := trim(InstallDir);
-			KillDir(InstallDir);
-			hK32 := GetModuleHandle('kernel32');
-			profileDir := GetEnvironmentVariable('USERPROFILE');
-			
-			if GetProcAddress(hK32, 'GetLocaleInfoEx') <> nil then begin
-				// Vista
-				KillDir(GetEnvironmentVariable('APPDATA')+'\Microsoft\Windows\Start Menu\Programs\DMDirc');
-				DeleteFile(GetEnvironmentVariable('USERPROFILE')+'\AppData\Roaming\Microsoft\Internet Explorer\Quick Launch\DMDirc.lnk');
-				DeleteFile(GetEnvironmentVariable('USERPROFILE')+'\Desktop\DMDirc.lnk');
-				profileDir := profileDir+'\AppData\Roaming\DMDirc';
+	if (ParamCount > 0) then begin
+		for i := 1 to ParamCount do begin
+			InstallDir := InstallDir+' '+paramstr(i);
+		end;
+		InstallDir := trim(InstallDir);
+		KillDir(InstallDir);
+		hK32 := GetModuleHandle('kernel32');
+		profileDir := GetEnvironmentVariable('USERPROFILE');
+		
+		if GetProcAddress(hK32, 'GetLocaleInfoEx') <> nil then begin
+			// Vista
+			KillDir(GetEnvironmentVariable('APPDATA')+'\Microsoft\Windows\Start Menu\Programs\DMDirc');
+			DeleteFile(GetEnvironmentVariable('USERPROFILE')+'\AppData\Roaming\Microsoft\Internet Explorer\Quick Launch\DMDirc.lnk');
+			DeleteFile(GetEnvironmentVariable('USERPROFILE')+'\Desktop\DMDirc.lnk');
+			profileDir := profileDir+'\AppData\Roaming\DMDirc';
+		end
+		else begin
+			// Not Vista
+			KillDir(GetEnvironmentVariable('USERPROFILE')+'\Microsoft\Windows\Start Menu\Programs\DMDirc');
+			DeleteFile(GetEnvironmentVariable('USERPROFILE')+'\Application Data\Microsoft\Internet Explorer\Quick Launch\DMDirc.lnk');
+			DeleteFile(GetEnvironmentVariable('USERPROFILE')+'\Desktop\DMDirc.lnk');
+			profileDir := profileDir+'\Application Data\DMDirc';
+		end;
+		// Remove irc:// handler if it is us.
+		deleteProtocol := false;
+		Reg := TRegistry.Create;
+		Reg.RootKey := HKEY_CLASSES_ROOT;
+		if Reg.OpenKey('irc\Shell\open\command', false) then begin
+			handlerInfo := Reg.ReadString('');
+			if (handlerInfo = '"'+InstallDir+'DMDirc.exe" -c %1') then begin
+				deleteProtocol := true;
 			end
-			else begin
-				// Not Vista
-				KillDir(GetEnvironmentVariable('USERPROFILE')+'\Microsoft\Windows\Start Menu\Programs\DMDirc');
-				DeleteFile(GetEnvironmentVariable('USERPROFILE')+'\Application Data\Microsoft\Internet Explorer\Quick Launch\DMDirc.lnk');
-				DeleteFile(GetEnvironmentVariable('USERPROFILE')+'\Desktop\DMDirc.lnk');
-				profileDir := profileDir+'\Application Data\DMDirc';
-			end;
-			// Remove irc:// handler if it is us.
-			deleteProtocol := false;
+		end;
+		Reg.CloseKey;
+		Reg.Free;
+		
+		if deleteProtocol then begin
 			Reg := TRegistry.Create;
 			Reg.RootKey := HKEY_CLASSES_ROOT;
-			if Reg.OpenKey('irc\Shell\open\command', false) then begin
-				handlerInfo := Reg.ReadString('');
-				if (handlerInfo = '"'+InstallDir+'DMDirc.exe" -c %1') then begin
-					deleteProtocol := true;
-				end
-			end;
-			Reg.CloseKey;
-			Reg.Free;
-			
-			if deleteProtocol then begin
-				Reg := TRegistry.Create;
-				Reg.RootKey := HKEY_CLASSES_ROOT;
-				Reg.DeleteKey('irc\Shell\open\command');
-				Reg.DeleteKey('irc\Shell\open');
-				Reg.DeleteKey('irc\Shell');
-				Reg.DeleteKey('irc\DefaultIcon');
-				Reg.DeleteKey('irc');
-				Reg.CloseKey;
-				Reg.Free;
-			end;
-				
-			Reg := TRegistry.Create;
-			Reg.RootKey := HKEY_LOCAL_MACHINE;
-			Reg.DeleteKey('SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DMDirc');
+			Reg.DeleteKey('irc\Shell\open\command');
+			Reg.DeleteKey('irc\Shell\open');
+			Reg.DeleteKey('irc\Shell');
+			Reg.DeleteKey('irc\DefaultIcon');
+			Reg.DeleteKey('irc');
 			Reg.CloseKey;
 			Reg.Free;
+		end;
 			
-			if (FileExists(profileDir+'\dmdirc.config')) then begin
-				if MessageBox(0, PChar('A dmdirc profile has been detected ('+profileDir+')'+#13#10+' Do you want to delete it aswell?'), 'DMDirc Uninstaller', MB_YESNO) = IDYES then begin
-					KillDir(profileDir);
-				end;
-			end;
-			
-			MessageBox(0, PChar('DMDirc has been uninstalled from "'+InstallDir+'".'), 'DMDirc Uninstaller', MB_OK);
-		end
-		else begin
-			if (ExecAndWait('java -jar ' + ExtractFileDir(paramstr(0)) + '\DMDirc.jar -k', true) <> 0) then begin
-				TempDir := GetTempDirectory;
-				CopyFile(pchar(paramstr(0)), pchar(TempDir+'/uninstall.exe'), false);
-				Launch(TempDir+'/uninstall.exe '+ExtractFileDir(paramstr(0))+'\');
-			end else begin
-				MessageBox(0, PChar('Uninstall Aborted - DMDirc is still running.'+#13#10+'Please close DMDirc before continuing'), 'DMDirc Uninstaller', MB_OK + MB_ICONEXCLAMATION);
+		Reg := TRegistry.Create;
+		Reg.RootKey := HKEY_LOCAL_MACHINE;
+		Reg.DeleteKey('SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\DMDirc');
+		Reg.CloseKey;
+		Reg.Free;
+		
+		if (FileExists(profileDir+'\dmdirc.config')) then begin
+			if MessageBox(0, PChar('A dmdirc profile has been detected ('+profileDir+')'+#13#10+' Do you want to delete it aswell?'), 'DMDirc Uninstaller', MB_YESNO) = IDYES then begin
+				KillDir(profileDir);
 			end;
 		end;
+		
+		MessageBox(0, PChar('DMDirc has been uninstalled from "'+InstallDir+'".'), 'DMDirc Uninstaller', MB_OK);
+	end
+	else if MessageBox(0, PChar('This will uninstall DMDirc.'+#13#10+#13#10+'Do you want to continue?'), 'DMDirc Uninstaller', MB_YESNO) = IDYES then begin
+		if (ExecAndWait('java -jar ' + ExtractFileDir(paramstr(0)) + '\DMDirc.jar -k', true) <> 0) then begin
+			TempDir := GetTempDirectory;
+			CopyFile(pchar(paramstr(0)), pchar(TempDir+'/uninstall.exe'), false);
+			Launch(TempDir+'/uninstall.exe '+ExtractFileDir(paramstr(0))+'\');
+		end else begin
+			MessageBox(0, PChar('Uninstall Aborted - DMDirc is still running.'+#13#10+'Please close DMDirc before continuing'), 'DMDirc Uninstaller', MB_OK + MB_ICONEXCLAMATION);
+		end;
 	end;
 end.