(svn r15566) -Change: reintroduce space as valid method of selecting 'content' as long as the filter box is not focused. Enter will also work when the filter box is focused.

1 files changed, 9 insertions, 5 deletions

diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp
index 54d190f20..a2be8557d 100644
--- a/src/network/network_content_gui.cpp
+++ b/src/network/network_content_gui.cpp
@@ -625,13 +625,17 @@ public:
 				this->list_pos = this->content.Length() - 1;
 				break;
 
+			case WKC_SPACE:
 			case WKC_RETURN:
-				if (this->selected != NULL) {
-					_network_content_client.ToggleSelectedState(this->selected);
-					this->content.ForceResort();
-					this->SetDirty();
+				if (keycode == WKC_RETURN || !IsWidgetFocused(NCLWW_FILTER)) {
+					if (this->selected != NULL) {
+						_network_content_client.ToggleSelectedState(this->selected);
+						this->content.ForceResort();
+						this->SetDirty();
+					}
+					return ES_HANDLED;
 				}
-				return ES_HANDLED;
+				/* Fall through when pressing space is pressed and filter isn't focused */
 
 			default: {
 				/* Handle editbox input */