[linux] Fixed last commit to still allow single screen setups (duoh)

mickelson · May 2, 2015 · e32f7aa · e32f7aa
1 parent bdb4424
commit e32f7aa
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git 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
@@ -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