From 16417acbfcef501dce57e03f880980449cfba47d Mon Sep 17 00:00:00 2001
From: "cyeh%netscape.com"
 <cyeh%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 20 Oct 1998 20:18:13 +0000
Subject: [PATCH] merge in change from Chris Nandor (pudge@pobox.com). Thought
 scc was going to handle this. sorry for the delay.

git-svn-id: svn://10.0.0.236/trunk@13211 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/build/mac/CodeWarriorLib.pm | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/mozilla/build/mac/CodeWarriorLib.pm b/mozilla/build/mac/CodeWarriorLib.pm
index f3af044836a..4c13bcfe7e3 100644
--- a/mozilla/build/mac/CodeWarriorLib.pm
+++ b/mozilla/build/mac/CodeWarriorLib.pm
@@ -33,7 +33,7 @@ use Mac::Types;
 use File::Basename;
 
 use vars qw($VERSION);
-$VERSION = '1.01';
+$VERSION = '1.02';
 
 my($app)  = 'CWIE';
 
@@ -163,8 +163,9 @@ sub activate () {
 	foreach $psi (values(%Process)) {
 		if ($psi->processSignature() eq $app) {
 			$appath = $psi->processAppSpec(), "\n";
+                        _save_appath($filepath, $appath);
+                        last;
 		}
-		_save_appath($filepath, $appath);
 	}
 
 	if ((!$appath || ! -x $appath) && open(F, $filepath)) {
@@ -186,9 +187,9 @@ sub activate () {
 			local(*D);
 			my $cwd = `pwd`;
 			$appath = _get_folder(
-				'Where is the folder containing CodeWarrior IDE?',
+                               'Where is the CW IDE folder?',
 				dirname($Application{$app})
-			) . ':';
+			);
 			die "CodeWarrior IDE not found.\n" if !$appath;
 			opendir(D, $appath) or die $!;
 			chdir($appath);
@@ -211,7 +212,10 @@ sub activate () {
 		launchAppSpec => $appath,
 		launchControlFlags => launchContinue() + launchNoFileFlags()
 	);
-	LaunchApplication($lp) or die $^E;
+        unless (LaunchApplication($lp)) {
+                unlink($filepath);
+                die $^E;
+        }
 }
 
 sub _build ($;$) {
@@ -332,6 +336,10 @@ sub _test ($) {
 
 =over 4
 
+=item v1.02, September 23, 1998
+
+Made fixes in finding and saving location of CodeWarrior IDE.
+
 =item v1.01, June 1, 1998
 
 Made fixes to C<chdir()> in C<activate()>, made C<activate()> more robust