Some comments and minor things changed.

src/eepp/base/string.cpp

@@ -134,12 +134,13 @@ void String::StrCopy( char * Dst, const char * Src, eeUint DstSize ) {
 }
 
 Int32 String::StartsWith( const std::string& Start, const std::string Str ) {
-	Int32 Pos = -1;
+	Int32 Pos	= -1;
+	Int32 s		= (Int32)Start.size();
 
-	if ( Str.size() >= Start.size() ) {
-		for ( Uint32 i = 0; i < Start.size(); i++ ) {
+	if ( (Int32)Str.size() >= s ) {
+		for ( Int32 i = 0; i < s; i++ ) {
 			if ( Start[i] == Str[i] ) {
-				Pos = (Int32)i;
+				Pos = i;
 			} else {
 				Pos = -1;
 				break;

src/eepp/ui/cuitheme.cpp

@@ -262,9 +262,13 @@ bool cUITheme::SearchFilesInAtlas( cTextureAtlas * SG, std::string Element, Uint
 				break;
 			}
 		}
+
+		if ( Found ) {
+			break;
+		}
 	}
 
-	// Seach Simple Skin
+	// Search Simple Skin
 	if ( !IsComplex ) {
 		for ( i = 0; i < cUISkinState::StateCount; i++ ) {
 			ElemName = Element + "_" + cUISkin::GetSkinStateName( i );

src/eepp/window/backend/SDL2/cwindowsdl2.cpp

@@ -92,6 +92,10 @@ cWindowSDL::~cWindowSDL() {
 		SDL_GL_DeleteContext( mGLContext );
 	}
 
+	if ( NULL != mGLContextThread ) {
+		SDL_GL_DeleteContext( mGLContextThread );
+	}
+
 #ifdef EE_USE_WMINFO
 	eeSAFE_DELETE( mWMinfo );
 #endif