Fixes #138, closes #139 - fix the b0rked lazy init of windowHandle

Author: robocoder

lib/WebDriver/LegacyWindow.php

@@ -62,7 +62,15 @@ public function __construct($url, $windowHandle = null)
     {
         parent::__construct($url);
 
+        if (! $windowHandle || $windowHandle === 'current') {
+            $result = $this->curl('GET', '_handle');
+
+            $windowHandle = $result['value'];
+        }
+
         $this->windowHandle = $windowHandle;
+
+        $this->url .= '/' . $windowHandle;
     }
 
     /**
@@ -74,12 +82,6 @@ public function __construct($url, $windowHandle = null)
      */
     public function getHandle()
     {
-        if (! $this->windowHandle) {
-            $result = $this->curl('GET', '_handle');
-
-            $this->windowHandle = $result['value'];
-        }
-
         return $this->windowHandle;
     }
 }