If no pwd is known in trouter, use the current working directory. Handle nil...

If no pwd is known in trouter, use the current working directory. Handle nil working directory better in smart selection code

ContextMenuActionPrefsController.m

@@ -54,7 +54,7 @@ static NSString* kParameterKey = @"parameter";
         title = [title stringByReplacingBackreference:i withString:repl];
     }
-    title = [title stringByReplacingEscapedChar:'d' withString:workingDirectory];
+    title = [title stringByReplacingEscapedChar:'d' withString:workingDirectory ?: @"."];
     title = [title stringByReplacingEscapedChar:'h' withString:remoteHost.hostname];
     title = [title stringByReplacingEscapedChar:'u' withString:remoteHost.username];
     title = [title stringByReplacingEscapedChar:'\\' withString:@"\\"];
@@ -96,7 +96,7 @@ static NSString* kParameterKey = @"parameter";
         parameter = [parameter stringByReplacingBackreference:i withString:repl];
     }
-    parameter = [parameter stringByReplacingEscapedChar:'d' withString:workingDirectory];
+    parameter = [parameter stringByReplacingEscapedChar:'d' withString:workingDirectory ?: @"."];
     parameter = [parameter stringByReplacingEscapedChar:'h' withString:remoteHost.hostname];
     parameter = [parameter stringByReplacingEscapedChar:'u' withString:remoteHost.username];
     parameter = [parameter stringByReplacingEscapedChar:'n' withString:@"\n"];

PTYSession.m

@@ -4391,6 +4391,10 @@ static long long timeInTenthsOfSeconds(struct timeval t)
     return [self encoding];
 }
+- (NSString *)textViewCurrentWorkingDirectory {
+    return [SHELL getWorkingDirectory];
+}
+
 - (void)textViewWillNeedUpdateForBlink
 {
     [self scheduleUpdateIn:[[PreferencePanel sharedInstance] timeBetweenBlinks]];

PTYTextView.h

@@ -112,7 +112,7 @@ typedef enum {
 - (void)textViewBeginDrag;
 - (void)textViewMovePane;
 - (NSStringEncoding)textViewEncoding;
-
+- (NSString *)textViewCurrentWorkingDirectory;
 @end
 @interface PTYTextView : NSView <

PTYTextView.m

@@ -9627,6 +9627,13 @@ static double EuclideanDistance(NSPoint p1, NSPoint p2) {
     int fileCharsTaken = 0;
     NSString *workingDirectory = [dataSource workingDirectoryOnLine:y];
+    if (!workingDirectory) {
+        // Well, just try the current directory then.
+        workingDirectory = [_delegate textViewCurrentWorkingDirectory];
+    }
+    if (!workingDirectory) {
+        workingDirectory = @"";
+    }
     // First, try to locate an existing filename at this location.
     NSString *filename = [self _bruteforcePathFromBeforeString:[[possibleFilePart1 mutableCopy] autorelease]
                                                    afterString:[[possibleFilePart2 mutableCopy] autorelease]