Fixed 'Select Window' always selecting the last window and not the

desired window.

Author: MarkusBernhardt

CHANGES.md

@@ -3,6 +3,7 @@ CHANGES
 
 unreleased
 ----------
+* Fixed 'Select Window' always selecting the last window and not the desired window.
 
 1.4.0.5
 -------

src/main/java/com/github/markusbernhardt/selenium2library/locators/WindowManager.java

@@ -97,18 +97,16 @@ protected static void selectMatching(WebDriver webDriver, Matcher matcher, Strin
 				// Window of current WebDriver instance is already closed
 			}
 
-			try {
-				for (String handle : webDriver.getWindowHandles()) {
-					webDriver.switchTo().window(handle);
-					if (matcher.match(getCurrentWindowInfo(webDriver))) {
-						return;
-					}
-				}
-			} finally {
-				if (startingHandle != null) {
-					webDriver.switchTo().window(startingHandle);
+			for (String handle : webDriver.getWindowHandles()) {
+				webDriver.switchTo().window(handle);
+				if (matcher.match(getCurrentWindowInfo(webDriver))) {
+					return;
 				}
 			}
+
+			if (startingHandle != null) {
+				webDriver.switchTo().window(startingHandle);
+			}
 			throw new Selenium2LibraryNonFatalException(error);
 		}
 	}