From e32f7aa6bc796ef86152b1ec9648fb2d8dc234b2 Mon Sep 17 00:00:00 2001
From: Andrew Mickelson <andrew.mickelson@gmail.com>
Date: Sat, 2 May 2015 12:59:34 -0700
Subject: [PATCH] [linux] Fixed last commit to still allow single screen setups
 (duoh)

---
 src/fe_util.cpp | 10 +++++-----
 src/fe_vm.cpp   |  6 +-----
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/fe_util.cpp b/src/fe_util.cpp
index 4fdd30aaf..f70879fd7 100644
--- a/src/fe_util.cpp
+++ b/src/fe_util.cpp
@@ -983,12 +983,12 @@ void get_xinerama_geometry( int &x, int &y, int &width, int &height )
 	{
 		x=-si[0].x_org;
 		y=-si[0].y_org;
+	}
 
-		for ( int i=0; i<num; i++ )
-		{
-			width = std::max( width, si[i].x_org + si[i].width );
-			height = std::max( height, si[i].y_org + si[i].height );
-		}
+	for ( int i=0; i<num; i++ )
+	{
+		width = std::max( width, si[i].x_org + si[i].width );
+		height = std::max( height, si[i].y_org + si[i].height );
 	}
 
 	XFree( si );
diff --git a/src/fe_vm.cpp b/src/fe_vm.cpp
index 90b1b32f8..8b987ad60 100644
--- a/src/fe_vm.cpp
+++ b/src/fe_vm.cpp
@@ -775,11 +775,7 @@ bool FeVM::on_transition(
 			sf::Event ev;
 			while (m_window.pollEvent(ev))
 			{
-				FeInputMap::Command c = m_feSettings->map_input( ev );
-
-				if (( c == FeInputMap::ExitMenu )
-						|| ( c == FeInputMap::ExitNoMenu ))
-					break;
+				//sf::sleep( sf::milliseconds( 10 ) );
 			}
 #endif