From f18f54fa5a46f153d43f1f982c02bd195c4c7752 Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Wed, 4 Feb 2015 13:41:21 +0100
Subject: [PATCH] Don't prepare to fetch translations unless we actually are
 going to use them.. In a couple of places in the code.

---
 Core/HLE/proAdhoc.cpp          | 8 ++++----
 GPU/GLES/ShaderManager.cpp     | 2 +-
 GPU/GLES/TransformPipeline.cpp | 1 +
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Core/HLE/proAdhoc.cpp b/Core/HLE/proAdhoc.cpp
index 2ca79884886f..b2b11a4a4575 100644
--- a/Core/HLE/proAdhoc.cpp
+++ b/Core/HLE/proAdhoc.cpp
@@ -1398,7 +1398,6 @@ int getPTPSocketCount(void) {
 }
 
 int initNetwork(SceNetAdhocctlAdhocId *adhoc_id){
-	I18NCategory *n = GetI18NCategory("Networking");
 	int iResult = 0;
 	metasocket = (int)INVALID_SOCKET;
 	metasocket = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
@@ -1412,8 +1411,8 @@ int initNetwork(SceNetAdhocctlAdhocId *adhoc_id){
 
 	// Resolve dns
 	addrinfo * resultAddr;
-    addrinfo * ptr;
-    in_addr serverIp;
+	addrinfo * ptr;
+	in_addr serverIp;
 	serverIp.s_addr = INADDR_NONE;
 
 	iResult = getaddrinfo(g_Config.proAdhocServer.c_str(),0,NULL,&resultAddr);
@@ -1456,7 +1455,8 @@ int initNetwork(SceNetAdhocctlAdhocId *adhoc_id){
 	memcpy(packet.game.data, adhoc_id->data, ADHOCCTL_ADHOCID_LEN);
 	int sent = send(metasocket, (char*)&packet, sizeof(packet), 0);
 	changeBlockingMode(metasocket, 1); // Change to non-blocking
-	if (sent > 0){
+	if (sent > 0) {
+		I18NCategory *n = GetI18NCategory("Networking");
 		osm.Show(n->T("Network Initialized"), 1.0);
 		return 0;
 	}
diff --git a/GPU/GLES/ShaderManager.cpp b/GPU/GLES/ShaderManager.cpp
index c7aabde883f9..30e804164fce 100644
--- a/GPU/GLES/ShaderManager.cpp
+++ b/GPU/GLES/ShaderManager.cpp
@@ -738,7 +738,6 @@ Shader *ShaderManager::ApplyVertexShader(int prim, u32 vertType) {
 	// if (g_Config.bPrescaleUV)
 	//	 globalDirty_ &= ~DIRTY_UVSCALEOFFSET;
 
-	I18NCategory *gs = GetI18NCategory("Graphics");
 	if (globalDirty_) {
 		if (lastShader_)
 			lastShader_->dirtyUniforms |= globalDirty_;
@@ -769,6 +768,7 @@ Shader *ShaderManager::ApplyVertexShader(int prim, u32 vertType) {
 		vs = new Shader(codeBuffer_, GL_VERTEX_SHADER, useHWTransform, VSID);
 
 		if (vs->Failed()) {
+			I18NCategory *gs = GetI18NCategory("Graphics");
 			ERROR_LOG(G3D, "Shader compilation failed, falling back to software transform");
 			osm.Show(gs->T("hardware transform error - falling back to software"), 2.5f, 0xFF3030FF, -1, true);
 			delete vs;
diff --git a/GPU/GLES/TransformPipeline.cpp b/GPU/GLES/TransformPipeline.cpp
index 444dbbe50805..65b7f3fe9d83 100644
--- a/GPU/GLES/TransformPipeline.cpp
+++ b/GPU/GLES/TransformPipeline.cpp
@@ -331,6 +331,7 @@ void TransformDrawEngine::SubmitPrim(void *verts, void *inds, GEPrimitiveType pr
 			Flush();
 		}
 	}
+	Flush();
 }
 
 void TransformDrawEngine::DecodeVerts() {