From ea2b923ddfe9be867c2f3686231cc324abd5b2fc Mon Sep 17 00:00:00 2001
From: Henrik Rydgard <hrydgard@gmail.com>
Date: Tue, 11 Jun 2013 09:34:16 +0200
Subject: [PATCH] Logic precedence error, warning fixes

---
 GPU/GLES/DisplayListInterpreter.cpp | 4 ++--
 UI/GameInfoCache.h                  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/GPU/GLES/DisplayListInterpreter.cpp b/GPU/GLES/DisplayListInterpreter.cpp
index 1b773d365d..a2b440c7b1 100644
--- a/GPU/GLES/DisplayListInterpreter.cpp
+++ b/GPU/GLES/DisplayListInterpreter.cpp
@@ -1012,8 +1012,8 @@ void GLES_GPU::DoBlockTransfer() {
 	u32 backBuffer = framebufferManager_.PrevDisplayFramebufAddr();
 	u32 displayBuffer = framebufferManager_.DisplayFramebufAddr();
 
-	if ((backBuffer != 0 && dstBasePtr == backBuffer) ||
-		  (displayBuffer != 0 && dstBasePtr == displayBuffer) &&
+	if (((backBuffer != 0 && dstBasePtr == backBuffer) ||
+		  (displayBuffer != 0 && dstBasePtr == displayBuffer)) &&
 			dstStride == 512 && height == 272) {
 		framebufferManager_.DrawPixels(Memory::GetPointer(dstBasePtr), 3, 512);
 	}
diff --git a/UI/GameInfoCache.h b/UI/GameInfoCache.h
index e9bbdf0ce3..2b3e1970c0 100644
--- a/UI/GameInfoCache.h
+++ b/UI/GameInfoCache.h
@@ -34,8 +34,8 @@
 class GameInfo {
 public:
 	GameInfo() 
-		: fileType(FILETYPE_UNKNOWN), iconTexture(NULL), pic0Texture(NULL), pic1Texture(NULL),
-		  wantBG(false), paramSFOLoaded(false), gameSize(0), saveDataSize(0) {}
+		: fileType(FILETYPE_UNKNOWN), paramSFOLoaded(false), iconTexture(NULL), pic0Texture(NULL), pic1Texture(NULL),
+		  wantBG(false), gameSize(0), saveDataSize(0) {}
 
 	bool DeleteGame();  // Better be sure what you're doing when calling this.
 	bool DeleteAllSaveData();