merged

src/modules/filesystem/physfs/wrap_Filesystem.cpp

@@ -212,7 +212,10 @@ namespace physfs
 		int size = tmp.size();
 
 		if(size <= 4 || strcmp(filename + (size-4), ".lua") != 0)
+		{
 			tmp.append(".lua");
+			size = tmp.size();
+		}
 
 		for(int i=0;i<size-4;i++)
 		{

src/modules/graphics/opengl/Graphics.cpp

@@ -198,6 +198,12 @@ namespace opengl
 				// FSAA might have failed, disable it and try again
 				SDL_GL_SetAttribute(SDL_GL_MULTISAMPLESAMPLES, 0);
 				failed = SDL_SetVideoMode(width, height, 32, sdlflags ) == 0;
+				if (failed)
+				{
+					// There might be no FSAA at all
+					SDL_GL_SetAttribute(SDL_GL_MULTISAMPLEBUFFERS, 0);
+					failed = SDL_SetVideoMode(width, height, 32, sdlflags ) == 0;
+				}
 			}
 			if(failed)
 			{